Coding convention

[u/mrichter/AliRoot.git] / PHOS / AliPHOSvFast.h

diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h
index 1cc77c918554535f5e125e716f6fb0a376606da4..739bb16323ac5293eb2fc8da03a96c6f256f9675 100644 (file)
--- a/PHOS/AliPHOSvFast.h
+++ b/PHOS/AliPHOSvFast.h
@@ -15,7 +15,7 @@
 //*-- Author: Yves Schutz (SUBATECH)
 
 // --- ROOT system ---
-#include "TClonesArray.h"
+//#include "TClonesArray.h"
 #include "TRandom.h"
 
 class TVector3 ;
@@ -32,17 +32,12 @@ public:
 
   AliPHOSvFast() ;
   AliPHOSvFast(const char *name, const char *title="") ;
-  AliPHOSvFast(const AliPHOSvFast & fast) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    assert(0==1) ; 
+  AliPHOSvFast(AliPHOSvFast & fast) : AliPHOS(fast) {
+    fast.Copy(*this) ; 
   }
   virtual ~AliPHOSvFast(void) ;
 
-  virtual void   AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) {
-    // useless since there are no hits
-    assert(0==1) ; 
-  }
+  virtual void Copy(AliPHOSvFast & fast) ; 
   void           AddRecParticle(const AliPHOSFastRecParticle & rp) ; // adds primary particle to the RecParticles list
   virtual void   BuildGeometry(void) ;                               // creates the geometry for the ROOT display
   virtual void   CreateGeometry(void) ;                              // creates the geometry for GEANT
@@ -50,14 +45,14 @@ public:
   virtual void   Init(void) ;                                        // does nothing
   virtual Int_t  IsVersion(void) const {
     // Gives the version number 
-    return 4 ; 
+    return 99 ; 
   }
 
-  void    MakeBranch(Option_t* opt, const char *file=0) ;
-  Double_t MakeEnergy(const Double_t energy) ;                       // makes the detected energy    
-  TVector3 MakePosition(const Double_t energy, const TVector3 pos, const Double_t th, const Double_t ph) ; 
+  void    MakeBranch(Option_t* opt);
+  Double_t MakeEnergy(Double_t energy) ;                       // makes the detected energy    
+  TVector3 MakePosition(Double_t energy, TVector3 pos, Double_t th, Double_t ph) ; 
                                                                      // makes the detected position
-  void MakeRecParticle(const Int_t modid, const TVector3 pos, AliPHOSFastRecParticle & rp) ;  // makes a reconstructes particle from primary
+  void MakeRecParticle(Int_t modid, TVector3 pos, AliPHOSFastRecParticle & rp) ;  // makes a reconstructes particle from primary
   Int_t   MakeType(AliPHOSFastRecParticle & rp) ;                    // gets the detected type of particle
   // gets TClonesArray of reconstructed particles
   TClonesArray * FastRecParticles() const { return fFastRecParticles ; } 
@@ -67,15 +62,13 @@ public:
   Double_t     SigmaE(Double_t energy) ;    // calulates the energy resolution at a given Energy                           
   Double_t     SigmaP(Double_t energy, Double_t inc) ; // calulates the position resolution at a given Energy at a given incidence                           
   virtual void StepManager(void) ;          // does the tracking through PHOS and a preliminary digitalization
-  virtual TString Version(void){ 
+  virtual const TString Version(void)const { 
     // As IsVersion
     return TString("vFast") ; 
   }
 
   AliPHOSvFast & operator = (const AliPHOSvFast & )  {
-    // assignement operator requested by coding convention but not needed
-    assert(0==1) ;
-    return *this ; 
+    Fatal("operator =", "not implemented") ; return *this ; 
   }
   
 private: