First attempt to use systemtically TFolders: the geometry object posts itself to...

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

diff --git a/PHOS/AliPHOSv4.h b/PHOS/AliPHOSv4.h
index 68ff21c7aef8747aaafe39f2524a7ad1700dde46..79c1deb89c53f7df93e05a303af6ff00d8fa65b9 100644 (file)
--- a/PHOS/AliPHOSv4.h
+++ b/PHOS/AliPHOSv4.h
@@ -49,25 +49,21 @@ public:
   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() {
-    // gets the pointer to the AliPHOSGeometry unique instance  
-    return fGeom ; 
-  }  
+  Float_t        GetBigBox(Int_t index) const;                             
   virtual void   Init(void) ;                                        // does nothing
   virtual Int_t  IsVersion(void) const {
     // Gives the version number 
     return 4 ; 
   }
 
-  void    MakeBranch(Option_t* opt, char *file=0) ;
+  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) ;                             
@@ -80,8 +76,7 @@ public:
   }
 
   AliPHOSv4 & operator = (const AliPHOSv4 & )  {
-    // assignement operator requested by coding convention
-    // but not needed
+    // assignement operator requested by coding convention but not needed
     assert(0==1) ;
     return *this ; 
   }
@@ -92,7 +87,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