Coding conventions (F.Carminati)

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

diff --git a/PHOS/AliPHOSGetter.h b/PHOS/AliPHOSGetter.h
index 0160e8962723cfdc307a8d3883aaf5ff61fda34f..e647553ee7e5cdf083664b5cf7f6b8bb13cfd85d 100644 (file)
--- a/PHOS/AliPHOSGetter.h
+++ b/PHOS/AliPHOSGetter.h
@@ -62,15 +62,15 @@ public:
   
   //=========== Instantiators ================
   static AliPHOSGetter * Instance(const char* headerFile,
-                                 const char* version = AliConfig::fgkDefaultEventFolderName,
+                                 const char* version = AliConfig::GetDefaultEventFolderName(),
                                  Option_t * openingOption = "READ" ) ; 
   static AliPHOSGetter * Instance() ; 
   
   static void Print() ; 
   
   //=========== General information about run ==============
-  Bool_t IsLoaded(const TString tree) const { return fLoadingStatus.Contains(tree) ; } 
-  void   SetLoaded(const TString tree) { fLoadingStatus += tree ; } 
+  Bool_t IsLoaded(TString tree) const { return fLoadingStatus.Contains(tree) ; } 
+  void   SetLoaded(TString tree) { fLoadingStatus += tree ; } 
   
   Int_t  MaxEvent() const ; 
   Int_t  EventNumber() const ; 
@@ -83,8 +83,8 @@ public:
   AliPHOSGeometry * PHOSGeometry() const ; 
   
   //========== Methods to read something from file ==========
-  void   Event(const Int_t event, const char * opt = "HSDRP") ;    
-  void   Track(const Int_t itrack) ;
+  void   Event(Int_t event, const char * opt = "HSDRTP") ;    
+  void   Track(Int_t itrack) ;
   
   //-----------------now getter's data--------------------------------------
   //  AliPHOSCalibrationDB * CalibrationDB(){return  fcdb; }
@@ -94,16 +94,16 @@ public:
   TClonesArray *    Primaries(void) ;
   TParticle * Primary(Int_t index) const ;
   Int_t       NPrimaries()const { return fNPrimaries; }
-  TParticle * Secondary(const TParticle * p, const Int_t index=1) const ;  
+  TParticle * Secondary(const TParticle * p, Int_t index=1) const ;  
   
   //=========== Hits =================
   TClonesArray *  Hits(void)  ; 
-  AliPHOSHit *    Hit(const Int_t index) { return dynamic_cast<AliPHOSHit*>(Hits()->At(index) );}
+  AliPHOSHit *    Hit(Int_t index) { return dynamic_cast<AliPHOSHit*>(Hits()->At(index) );}
   TTree *         TreeH() const ; 
   
   //=========== SDigits ==============
   TClonesArray *      SDigits() ;  
-  AliPHOSDigit *      SDigit(const Int_t index) { return static_cast<AliPHOSDigit *>(SDigits()->At(index)) ;} 
+  AliPHOSDigit *      SDigit(Int_t index) { return static_cast<AliPHOSDigit *>(SDigits()->At(index)) ;} 
   TTree *             TreeS() const ; 
   AliPHOSSDigitizer * SDigitizer() ;  
   
@@ -116,7 +116,7 @@ public:
   
   //========== Digits ================
   TClonesArray * Digits() ;
-  AliPHOSDigit * Digit(const Int_t index) { return static_cast<AliPHOSDigit *>(Digits()->At(index)) ;} 
+  AliPHOSDigit * Digit(Int_t index) { return static_cast<AliPHOSDigit *>(Digits()->At(index)) ;} 
   TTree *        TreeD() const ; 
   AliPHOSDigitizer * Digitizer() ;
   TString             GetDigitsFileName() const { return PhosLoader()->GetDigitsFileName() ; }  
@@ -129,9 +129,9 @@ public:
   
   //========== RecPoints =============
   TObjArray *           EmcRecPoints() ;
-  AliPHOSEmcRecPoint *  EmcRecPoint(const Int_t index) { return static_cast<AliPHOSEmcRecPoint *>(EmcRecPoints()->At(index)) ;} 
+  AliPHOSEmcRecPoint *  EmcRecPoint(Int_t index) { return static_cast<AliPHOSEmcRecPoint *>(EmcRecPoints()->At(index)) ;} 
   TObjArray *           CpvRecPoints() ; 
-  AliPHOSCpvRecPoint *  CpvRecPoint(const Int_t index) { return static_cast<AliPHOSCpvRecPoint *>(CpvRecPoints()->At(index)) ;} 
+  AliPHOSCpvRecPoint *  CpvRecPoint(Int_t index) { return static_cast<AliPHOSCpvRecPoint *>(CpvRecPoints()->At(index)) ;} 
   TTree *               TreeR() const ;
   AliPHOSClusterizer * Clusterizer() ;
   TString               GetRecPointsFileName() const { return PhosLoader()->GetRecPointsFileName() ; } 
@@ -144,7 +144,7 @@ public:
   
   //========== TrackSegments   TClonesArray * TrackSegments(const char * name = 0) { 
   TClonesArray *           TrackSegments() ;
-  AliPHOSTrackSegment *  TrackSegments(const Int_t index) { return static_cast<AliPHOSTrackSegment *>(TrackSegments()->At(index)) ;} 
+  AliPHOSTrackSegment *  TrackSegment(Int_t index) { return static_cast<AliPHOSTrackSegment *>(TrackSegments()->At(index)) ;} 
   TTree *               TreeT() const ;
   AliPHOSTrackSegmentMaker * TrackSegmentMaker() ;
   TString               GetTracksFileName() const { return PhosLoader()->GetTracksFileName() ; } 
@@ -157,7 +157,7 @@ public:
   
   //========== RecParticles ===========
   TClonesArray *         RecParticles() ;
-  AliPHOSRecParticle *   RecPaticles(const Int_t index) { return static_cast<AliPHOSRecParticle *>(RecParticles()->At(index)) ;} 
+  AliPHOSRecParticle *   RecParticle(Int_t index) { return static_cast<AliPHOSRecParticle *>(RecParticles()->At(index)) ;} 
   TTree *               TreeP() const ;
   AliPHOSPID * PID() ;
   TString               GetRecParticlesFileName() const { return PhosLoader()->GetRecParticlesFileName() ; } 
@@ -182,15 +182,15 @@ public:
   
   TString Version() const  { return PhosLoader()->GetTitle() ; } 
   AliPHOSLoader * PhosLoader() const { return  fgPhosLoader ; }
-  void Reset() {fgPhosLoader = 0; fgObjGetter = 0; }
+  void Reset() ;
   
   AliESD * ESD(Int_t event = 0) ;
-  Bool_t OpenESDFile(TString name = "AliESDs.root") ;
+  Bool_t OpenESDFile() ;
   
 private:
   
   AliPHOSGetter(const char* headerFile,
-               const char* version = AliConfig::fgkDefaultEventFolderName,
+               const char* version = AliConfig::GetDefaultEventFolderName(),
                Option_t * openingOption = "READ") ;
   
   Int_t ReadTreeD(void) ;