X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSvFast.h;h=1cc77c918554535f5e125e716f6fb0a376606da4;hb=206ce9d6d22996a0828bba05e5dc456d36964614;hp=0833762cd3a80d94df7cf9453c7c93b94f107ece;hpb=cede8016785004639573fc58f6c51b7eb7a7bdc9;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSvFast.h b/PHOS/AliPHOSvFast.h
index 0833762cd3a..1cc77c91855 100644
--- a/PHOS/AliPHOSvFast.h
+++ b/PHOS/AliPHOSvFast.h
@@ -18,17 +18,19 @@
 #include "TClonesArray.h"
 #include "TRandom.h"
 
+class TVector3 ;
+class TFile;
+
 // --- AliRoot header files ---
 #include "AliPHOS.h"
-#include "AliPHOSGeometry.h"
-#include "AliPHOSPID.h"
+class AliPHOSGeometry ;
 class AliPHOSFastRecParticle ;
 
 class AliPHOSvFast : public AliPHOS {
 
 public:
 
-  AliPHOSvFast(void) ;
+  AliPHOSvFast() ;
   AliPHOSvFast(const char *name, const char *title="") ;
   AliPHOSvFast(const AliPHOSvFast & fast) {
     // cpy ctor: no implementation yet
@@ -37,31 +39,41 @@ public:
   }
   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) ; 
+  }
   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
-  Float_t        GetBigBox(Int_t index) ;                             
-  virtual AliPHOSGeometry * GetGeometry() { return fGeom ; }  
+  Float_t        GetBigBox(Int_t index) const;                             
   virtual void   Init(void) ;                                        // does nothing
-  Int_t   IsVersion(void) const { return -1 ; }
-  void    MakeBranch(Option_t* opt, char *file=0) ;
+  virtual Int_t  IsVersion(void) const {
+    // Gives the version number 
+    return 4 ; 
+  }
+
+  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) ; 
                                                                      // makes the detected position
   void MakeRecParticle(const Int_t modid, const 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() { return fFastRecParticles ; } 
+  TClonesArray * FastRecParticles() const { return fFastRecParticles ; } 
   virtual void ResetPoints() ; 
   void         ResetFastRecParticles() ; 
   void         SetBigBox(Int_t index, Float_t value) ;                             
   Double_t     SigmaE(Double_t energy) ;    // calulates the energy resolution at a given Energy                           
-  Double_t     SigmaP(Double_t energy, Int_t inc) ; // calulates the position resolution at a given Energy at a given incidence                           
+  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){ 
+    // As IsVersion
+    return TString("vFast") ; 
+  }
 
-  AliPHOSvFast & operator = (const AliPHOSvFast & rvalue)  {
-    // assignement operator requested by coding convention
-    // but not needed
+  AliPHOSvFast & operator = (const AliPHOSvFast & )  {
+    // assignement operator requested by coding convention but not needed
     assert(0==1) ;
     return *this ; 
   }
@@ -72,7 +84,6 @@ private:
   Float_t fBigBoxY ;                         // main box containing all PHOS (EMC+PPSD)
   Float_t fBigBoxZ ;                         // main box containing all PHOS (EMC+PPSD)
   TClonesArray * fFastRecParticles ;         // list of particles modified by the response function 
-  AliPHOSGeometry * fGeom ;                  // geometry definition
   Int_t fNRecParticles ;                     // number of detected particles
   TRandom fRan ;                             // random number generator
   Double_t fResPara1 ;                       // parameter for the energy resolution dependence