coding convention

diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx
index 7613c400c68a1f04570509e7b56f10a2d9d60c1f..c7027d830524a1f3df463793384c5d3f4bedcd32 100644 (file)
--- a/EMCAL/AliEMCALGetter.cxx
+++ b/EMCAL/AliEMCALGetter.cxx
@@ -42,17 +42,13 @@
 
 #include "TSystem.h"
 #include "TFile.h"
-// #include "TTree.h"
 #include "TROOT.h"
-// #include "TObjString.h"
-// #include "TFolder.h"
-// #include "TParticle.h"
+
 
 // --- Standard library ---
 
 // --- AliRoot header files ---
-// #include "AliRun.h"
-// #include "AliConfig.h"
+
 #include "AliEMCALGetter.h"
 #include "AliEMCAL.h"
 #include "AliRunLoader.h"
@@ -114,6 +110,7 @@ AliEMCALGetter::~AliEMCALGetter()
 //____________________________________________________________________________ 
 AliEMCALClusterizer * AliEMCALGetter::Clusterizer()
 { 
+  // return pointer to Clusterizer Tree
   AliEMCALClusterizer * rv ; 
   rv =  dynamic_cast<AliEMCALClusterizer *>(EmcalLoader()->Reconstructioner()) ;
   if (!rv) {
@@ -125,7 +122,7 @@ AliEMCALClusterizer * AliEMCALGetter::Clusterizer()
 
 
 //____________________________________________________________________________ 
-TClonesArray * AliEMCALGetter::Digits() 
+TClonesArray * AliEMCALGetter::Digits() const  
 {
   // asks the Loader to return the Digits container 
 
@@ -142,6 +139,7 @@ TClonesArray * AliEMCALGetter::Digits()
 //____________________________________________________________________________ 
 AliEMCALDigitizer * AliEMCALGetter::Digitizer() 
 { 
+  // return pointer to Digitizer Tree
   AliEMCALDigitizer * rv ; 
   rv =  dynamic_cast<AliEMCALDigitizer *>(EmcalLoader()->Digitizer()) ;
   if (!rv) {
@@ -153,7 +151,7 @@ AliEMCALDigitizer * AliEMCALGetter::Digitizer()
 
 
 //____________________________________________________________________________ 
-TObjArray * AliEMCALGetter::PRERecPoints() 
+TObjArray * AliEMCALGetter::PRERecPoints() const 
 {
   // asks the Loader to return the EMC RecPoints container 
 
@@ -168,7 +166,7 @@ TObjArray * AliEMCALGetter::PRERecPoints()
 }
 
 //____________________________________________________________________________ 
-TObjArray * AliEMCALGetter::ECARecPoints() 
+TObjArray * AliEMCALGetter::ECARecPoints() const 
 {
   // asks the Loader to return the EMC RecPoints container 
 
@@ -183,7 +181,7 @@ TObjArray * AliEMCALGetter::ECARecPoints()
 }
 
 //____________________________________________________________________________ 
-TObjArray * AliEMCALGetter::HCARecPoints() 
+TObjArray * AliEMCALGetter::HCARecPoints() const 
 {
   // asks the Loader to return the EMC RecPoints container 
 
@@ -198,7 +196,7 @@ TObjArray * AliEMCALGetter::HCARecPoints()
 }
 
 //____________________________________________________________________________ 
-TClonesArray * AliEMCALGetter::TrackSegments() 
+TClonesArray * AliEMCALGetter::TrackSegments() const 
 {
   // asks the Loader to return the TrackSegments container 
 
@@ -215,6 +213,7 @@ TClonesArray * AliEMCALGetter::TrackSegments()
 //____________________________________________________________________________ 
 AliEMCALTrackSegmentMaker * AliEMCALGetter::TrackSegmentMaker() 
 { 
+  // return pointer to TrackSegmentMaker Tree
   AliEMCALTrackSegmentMaker * rv ; 
   rv =  dynamic_cast<AliEMCALTrackSegmentMaker *>(EmcalLoader()->TrackSegmentMaker()) ;
   if (!rv) {
@@ -225,7 +224,7 @@ AliEMCALTrackSegmentMaker * AliEMCALGetter::TrackSegmentMaker()
 }
 
 //____________________________________________________________________________ 
-TClonesArray * AliEMCALGetter::RecParticles() 
+TClonesArray * AliEMCALGetter::RecParticles() const  
 {
   // asks the Loader to return the TrackSegments container 
 
@@ -305,7 +304,7 @@ Int_t AliEMCALGetter::EventNumber() const
 }
 
 //____________________________________________________________________________ 
-  TClonesArray * AliEMCALGetter::Hits()  
+  TClonesArray * AliEMCALGetter::Hits() const   
 {
   // asks the loader to return  the Hits container 
   
@@ -406,6 +405,7 @@ AliEMCAL * AliEMCALGetter:: EMCAL() const
 //____________________________________________________________________________ 
 AliEMCALPID * AliEMCALGetter::PID() 
 { 
+  // return pointer to PID Tree
   AliEMCALPID * rv ; 
   rv =  dynamic_cast<AliEMCALPID *>(EmcalLoader()->PIDTask()) ;
   if (!rv) {
@@ -565,7 +565,7 @@ Int_t AliEMCALGetter::ReadTreeS()
 }
 
 //____________________________________________________________________________ 
-TClonesArray * AliEMCALGetter::SDigits() 
+TClonesArray * AliEMCALGetter::SDigits() const  
 {
   // asks the Loader to return the Digits container 
 
@@ -582,6 +582,7 @@ TClonesArray * AliEMCALGetter::SDigits()
 //____________________________________________________________________________ 
 AliEMCALSDigitizer * AliEMCALGetter::SDigitizer() 
 { 
+  // return pointer to SDigitizer Tree
   AliEMCALSDigitizer * rv ; 
   rv =  dynamic_cast<AliEMCALSDigitizer *>(EmcalLoader()->SDigitizer()) ;
   if (!rv) {
@@ -633,6 +634,7 @@ void AliEMCALGetter::Track(const Int_t itrack)
 //____________________________________________________________________________ 
 TTree * AliEMCALGetter::TreeD() const 
 {
+  // return pointer to Digits Tree
   TTree * rv = 0 ; 
   rv = EmcalLoader()->TreeD() ; 
   if ( !rv ) {
@@ -646,6 +648,7 @@ TTree * AliEMCALGetter::TreeD() const
 //____________________________________________________________________________ 
 TTree * AliEMCALGetter::TreeH() const 
 {
+  // return pointer to Hits Tree
   TTree * rv = 0 ; 
   rv = EmcalLoader()->TreeH() ; 
   if ( !rv ) {
@@ -659,6 +662,8 @@ TTree * AliEMCALGetter::TreeH() const
 //____________________________________________________________________________ 
 TTree * AliEMCALGetter::TreeR() const 
 {
+  // return pointer to RecPoints Tree
+
   TTree * rv = 0 ; 
   rv = EmcalLoader()->TreeR() ; 
   if ( !rv ) {
@@ -671,7 +676,8 @@ TTree * AliEMCALGetter::TreeR() const
 
 //____________________________________________________________________________ 
 TTree * AliEMCALGetter::TreeT() const 
-{
+{  
+  // return pointer to TrackSegments Tree
   TTree * rv = 0 ; 
   rv = EmcalLoader()->TreeT() ; 
   if ( !rv ) {
@@ -684,6 +690,7 @@ TTree * AliEMCALGetter::TreeT() const
 //____________________________________________________________________________ 
 TTree * AliEMCALGetter::TreeP() const 
 {
+  // return pointer to RecParticles Tree
   TTree * rv = 0 ; 
   rv = EmcalLoader()->TreeP() ; 
   if ( !rv ) {
@@ -697,6 +704,7 @@ TTree * AliEMCALGetter::TreeP() const
 //____________________________________________________________________________ 
 TTree * AliEMCALGetter::TreeS() const 
 {
+  // return pointer to SDigits Tree
   TTree * rv = 0 ; 
   rv = EmcalLoader()->TreeS() ; 
   if ( !rv ) {

diff --git a/EMCAL/AliEMCALGetter.h b/EMCAL/AliEMCALGetter.h
index ce88c10bcdbbd3afc981a3935e49baeb5e896def..c6aaaf5eafaf48ea18c0e9f5808d4f2cc71c6087 100644 (file)
--- a/EMCAL/AliEMCALGetter.h
+++ b/EMCAL/AliEMCALGetter.h
@@ -18,13 +18,9 @@
 
 // --- ROOT system ---
 #include "TObject.h"  
-#include "TClonesArray.h" 
-// #include "TFolder.h"  
-// #include "TTree.h"
-// #include "TFile.h"
-// class TString ;
- class TParticle ;
-// class TTask ;
+#include "TClonesArray.h"
+class TParticle ;
+class TTree ; 
 
 // --- Standard library ---
 
@@ -32,24 +28,21 @@
 #include "AliConfig.h" 
 
 // #include "AliRun.h"
-class AliEMCAL ; 
 #include "AliEMCALHit.h"   
-// #include "AliEMCALDigit.h"
-// #include "AliEMCALRecPoint.h"
-// #include "AliEMCALRecPoint.h"
-// #include "AliEMCALTrackSegment.h"
 #include "AliEMCALRecParticle.h"
-class AliEMCALGeometry ;
 #include "AliEMCALDigitizer.h"
 #include "AliEMCALSDigitizer.h" 
-// class AliEMCALClusterizer ;
-// class AliEMCALTrackSegmentMaker ;
-// class AliEMCALPID ;
-// //class AliEMCALCalibrationDB ;
-// class AliEMCALConTableDB ;
+#include "AliEMCALLoader.h" 
+class AliEMCAL ; 
+class AliEMCALGeometry ; 
+class AliEMCALClusterizer ; 
+class AliEMCALRecPoint ; 
+class AliEMCALTowerRecPoint ; 
+class AliEMCALTrackSegmentMaker ;
+class AliEMCALTrackSegment ; 
+class AliEMCALPID ; 
 class AliEMCALBeamTestEvent ;
 
-#include "AliEMCALLoader.h" 
 
 class AliEMCALGetter : public TObject {
   
@@ -108,82 +101,82 @@ class AliEMCALGetter : public TObject {
   
 //   //=========== Hits =================
 //   TTree *               TreeH(TString filename="") ; 
-  TClonesArray *  Hits(void)  ; 
-  AliEMCALHit *    Hit(const Int_t index) { return dynamic_cast<AliEMCALHit*>(Hits()->At(index) );}
+  TClonesArray *  Hits(void) const  ; 
+  AliEMCALHit *    Hit(const Int_t index) const { return dynamic_cast<AliEMCALHit*>(Hits()->At(index) );}
   TTree *         TreeH() const ; 
   
   //=========== SDigits ==============
-  TClonesArray *      SDigits() ;  
-  AliEMCALDigit *      SDigit(const Int_t index) { return static_cast<AliEMCALDigit *>(SDigits()->At(index)) ;} 
+  TClonesArray *      SDigits() const ;  
+  AliEMCALDigit *      SDigit(const Int_t index) const { return static_cast<AliEMCALDigit *>(SDigits()->At(index)) ;} 
   TTree *             TreeS() const ; 
   AliEMCALSDigitizer * SDigitizer() ;  
 
-  TString             GetSDigitsFileName() { return EmcalLoader()->GetSDigitsFileName() ; }  
-  Int_t               LoadSDigits(Option_t* opt="") { return EmcalLoader()->LoadSDigits(opt) ; }
-  Int_t               LoadSDigitizer(Option_t* opt=""){ return  EmcalLoader()->LoadSDigitizer(opt) ; }
-  Int_t               WriteSDigits(Option_t* opt="") { return EmcalLoader()->WriteSDigits(opt) ; }
-  Int_t               WriteSDigitizer(Option_t* opt=""){
+  TString             GetSDigitsFileName() const { return EmcalLoader()->GetSDigitsFileName() ; }  
+  Int_t               LoadSDigits(Option_t* opt="") const { return EmcalLoader()->LoadSDigits(opt) ; }
+  Int_t               LoadSDigitizer(Option_t* opt="") const { return  EmcalLoader()->LoadSDigitizer(opt) ; }
+  Int_t               WriteSDigits(Option_t* opt="") const { return EmcalLoader()->WriteSDigits(opt) ; }
+  Int_t               WriteSDigitizer(Option_t* opt="") const {
     return  EmcalLoader()->WriteSDigitizer(opt) ; }
   
   //========== Digits ================
-  TClonesArray * Digits() ;
-  AliEMCALDigit * Digit(const Int_t index) { return static_cast<AliEMCALDigit *>(Digits()->At(index)) ;} 
+  TClonesArray * Digits() const ;
+  AliEMCALDigit * Digit(const Int_t index) const { return static_cast<AliEMCALDigit *>(Digits()->At(index)) ;} 
   TTree *        TreeD() const ; 
   AliEMCALDigitizer * Digitizer() ;
-  TString             GetDigitsFileName() { return EmcalLoader()->GetDigitsFileName() ; }  
-  Int_t               LoadDigits(Option_t* opt="") { return EmcalLoader()->LoadDigits(opt) ; }
-  Int_t               LoadDigitizer(Option_t* opt=""){
+  TString             GetDigitsFileName() const { return EmcalLoader()->GetDigitsFileName() ; }  
+  Int_t               LoadDigits(Option_t* opt="") const { return EmcalLoader()->LoadDigits(opt) ; }
+  Int_t               LoadDigitizer(Option_t* opt="") const {
     return  EmcalLoader()->LoadDigitizer(opt) ; }
-  Int_t               WriteDigits(Option_t* opt="") { return EmcalLoader()->WriteDigits(opt) ; }
-  Int_t               WriteDigitizer(Option_t* opt=""){
+  Int_t               WriteDigits(Option_t* opt="") const { return EmcalLoader()->WriteDigits(opt) ; }
+  Int_t               WriteDigitizer(Option_t* opt="") const {
     return  EmcalLoader()->WriteDigitizer(opt) ; }
   
   //========== RecPoints =============
-  TObjArray *             PRERecPoints() ;
-  AliEMCALRecPoint *      PRERecPoint(const Int_t index) { return static_cast<AliEMCALRecPoint *>(PRERecPoints()->At(index)) ;} 
-  TObjArray *             ECARecPoints() ;
-  AliEMCALTowerRecPoint * ECARecPoint(const Int_t index) { return static_cast<AliEMCALTowerRecPoint *>(ECARecPoints()->At(index)) ;} 
-  TObjArray *             HCARecPoints() ;
-  AliEMCALTowerRecPoint * HCARecPoint(const Int_t index) { return static_cast<AliEMCALTowerRecPoint *>(HCARecPoints()->At(index)) ;} 
+  TObjArray *             PRERecPoints() const ;
+  AliEMCALRecPoint *      PRERecPoint(const Int_t index) const { return static_cast<AliEMCALRecPoint *>(PRERecPoints()->At(index)) ;} 
+  TObjArray *             ECARecPoints() const ;
+  AliEMCALTowerRecPoint * ECARecPoint(const Int_t index) const { return static_cast<AliEMCALTowerRecPoint *>(ECARecPoints()->At(index)) ;} 
+  TObjArray *             HCARecPoints() const ;
+  AliEMCALTowerRecPoint * HCARecPoint(const Int_t index) const { return static_cast<AliEMCALTowerRecPoint *>(HCARecPoints()->At(index)) ;} 
   TTree *                 TreeR() const ;
   AliEMCALClusterizer *   Clusterizer()  ;
-  TString                 GetRecPointsFileName() { return EmcalLoader()->GetRecPointsFileName() ; } 
-  Int_t                   LoadRecPoints(Option_t* opt="") { return EmcalLoader()->LoadRecPoints(opt) ; }
-  Int_t                   LoadClusterizer(Option_t* opt=""){
+  TString                 GetRecPointsFileName() const { return EmcalLoader()->GetRecPointsFileName() ; } 
+  Int_t                   LoadRecPoints(Option_t* opt="") const { return EmcalLoader()->LoadRecPoints(opt) ; }
+  Int_t                   LoadClusterizer(Option_t* opt="") const {
     return  EmcalLoader()->LoadClusterizer(opt) ; }
-  Int_t                   WriteRecPoints(Option_t* opt="") { return EmcalLoader()->WriteRecPoints(opt) ; }
-  Int_t                   WriteClusterizer(Option_t* opt=""){
+  Int_t                   WriteRecPoints(Option_t* opt="") const { return EmcalLoader()->WriteRecPoints(opt) ; }
+  Int_t                   WriteClusterizer(Option_t* opt="") const {
     return  EmcalLoader()->WriteClusterizer(opt) ; }
 
   //========== TrackSegments   TClonesArray * TrackSegments(const char * name = 0) { 
-  TClonesArray *           TrackSegments() ;
-  AliEMCALTrackSegment *  TrackSegments(const Int_t index) { return static_cast<AliEMCALTrackSegment *>(TrackSegments()->At(index)) ;} 
+  TClonesArray *           TrackSegments() const ;
+  AliEMCALTrackSegment *  TrackSegments(const Int_t index) const { return static_cast<AliEMCALTrackSegment *>(TrackSegments()->At(index)) ;} 
   TTree *               TreeT() const ;
   AliEMCALTrackSegmentMaker * TrackSegmentMaker() ;
-  TString               GetTracksFileName() { return EmcalLoader()->GetTracksFileName() ; } 
-  Int_t                 LoadTracks(Option_t* opt="") { return EmcalLoader()->LoadTracks(opt) ; }
-  Int_t                 LoadTrackSegementMaker(Option_t* opt=""){
+  TString               GetTracksFileName() const { return EmcalLoader()->GetTracksFileName() ; } 
+  Int_t                 LoadTracks(Option_t* opt="") const { return EmcalLoader()->LoadTracks(opt) ; }
+  Int_t                 LoadTrackSegementMaker(Option_t* opt="") const {
     return  EmcalLoader()->LoadTrackSegmentMaker(opt) ; }
-  Int_t                 WriteTracks(Option_t* opt="") { return EmcalLoader()->WriteTracks(opt) ; }
-  Int_t                 WriteTrackSegmentMaker(Option_t* opt=""){
+  Int_t                 WriteTracks(Option_t* opt="") const { return EmcalLoader()->WriteTracks(opt) ; }
+  Int_t                 WriteTrackSegmentMaker(Option_t* opt="") const {
     return  EmcalLoader()->WriteTracker(opt) ; }
   //========== RecParticles ===========
 
-  TClonesArray *         RecParticles() ;
-  AliEMCALRecParticle *   RecPaticles(const Int_t index) { return static_cast<AliEMCALRecParticle *>(RecParticles()->At(index)) ;} 
+  TClonesArray *         RecParticles() const ;
+  AliEMCALRecParticle *   RecPaticles(const Int_t index) const { return static_cast<AliEMCALRecParticle *>(RecParticles()->At(index)) ;} 
   TTree *               TreeP() const ;
   AliEMCALPID * PID() ;
-  TString               GetRecParticlesFileName() { return EmcalLoader()->GetRecParticlesFileName() ; } 
-  Int_t                 LoadRecParticles(Option_t* opt="") { return EmcalLoader()->LoadRecParticles(opt) ; }
-  Int_t                 LoadPID(Option_t* opt=""){
+  TString               GetRecParticlesFileName() const { return EmcalLoader()->GetRecParticlesFileName() ; } 
+  Int_t                 LoadRecParticles(Option_t* opt="") const { return EmcalLoader()->LoadRecParticles(opt) ; }
+  Int_t                 LoadPID(Option_t* opt="") const {
     return  EmcalLoader()->LoadPID(opt) ; }
-  Int_t                 WriteRecParticles(Option_t* opt="") { return EmcalLoader()->WriteRecParticles(opt) ; }
-  Int_t                 WritePID(Option_t* opt=""){
+  Int_t                 WriteRecParticles(Option_t* opt="") const { return EmcalLoader()->WriteRecParticles(opt) ; }
+  Int_t                 WritePID(Option_t* opt="") const {
     return  EmcalLoader()->WritePID(opt) ; }
 
 
   void SetDebug(Int_t level) {fgDebug = level;} // Set debug level 
-  void PostClusterizer(AliEMCALClusterizer * clu) 
+    void PostClusterizer(AliEMCALClusterizer * clu) 
     const{EmcalLoader()->PostClusterizer(clu) ; }
   void PostPID(AliEMCALPID * pid) 
     const{EmcalLoader()->PostPID(pid) ; }
@@ -227,7 +220,7 @@ private:
 
 //  AliEMCALCalibrationDB * fcdb ;       //!
    
-  static AliEMCALLoader * fgEmcalLoader ;
+  static AliEMCALLoader * fgEmcalLoader ; // pointer to EMCAL Loader
   static AliEMCALGetter * fgObjGetter; // pointer to the unique instance of the singleton 
   
   enum EDataTypes{kHits,kSDigits,kDigits,kRecPoints,kTracks,kNDataTypes};