Effective c++, committed on behalf of �ystein Djuvsland

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALLoader.h

diff --git a/EMCAL/AliEMCALLoader.h b/EMCAL/AliEMCALLoader.h
index 79b43822211d2f1d223cb8998c8ed2dedc6b5ef8..bd361cad85f2c82bf05d71ff5a7669dbc7503b1e 100644 (file)
--- a/EMCAL/AliEMCALLoader.h
+++ b/EMCAL/AliEMCALLoader.h
@@ -27,6 +27,7 @@ class TTask ;
 // --- AliRoot header files ---
 #include "AliLoader.h"
 #include "AliEMCALCalibData.h"
+#include "AliEMCALRecParam.h"
 
 class AliLoader ;
 class AliEMCAL ; 
@@ -40,8 +41,9 @@ class AliEMCALLoader : public AliLoader {
  public:
 
   AliEMCALLoader();
-  AliEMCALLoader(const AliEMCALLoader & obj):AliLoader(obj){}
+  AliEMCALLoader(const AliEMCALLoader & obj);
   AliEMCALLoader(const Char_t *detname,const Char_t *eventfoldername); 
+  AliEMCALLoader(const Char_t *name,TFolder *topfolder);
   
   virtual ~AliEMCALLoader() ; 
 
@@ -103,10 +105,11 @@ class AliEMCALLoader : public AliLoader {
   //Calibration
 
   Int_t CalibrateRaw (Double_t energy, Int_t module, Int_t column, Int_t row);//take real calibration coefficients
- 
-  void  SetCalibData(AliEMCALCalibData* calibda) { fCalibData = calibda; }
- 
-  AliEMCALCalibData * CalibData(); // to get the CDB object
+  
+  void  SetCalibData(AliEMCALCalibData* calibda)  { fgCalibData = calibda; }
+  AliEMCALCalibData * CalibData(); // to get the calibration CDB object
+
+  AliEMCALRecParam * RecParam();   // to get rec.parameters from CDB
 
 private:
  
@@ -120,10 +123,12 @@ private:
   TClonesArray     *fHits;         //! TClonesArray of hits (for tree reading)
   TClonesArray     *fDigits;       //! TClonesArray of digits (for tree reading)
   TClonesArray     *fSDigits;      //! TClonesArray of sdigits (for tree reading)
-  TObjArray        *fRecPoints;    //! TClonesArray of recpoints (for tree reading)
-  static AliEMCALCalibData * fCalibData;  //  calibration data 
+  TObjArray        *fRecPoints;    //! TClonesArray of recpoints (for tree reading)   
+  
+  static AliEMCALCalibData * fgCalibData;  //  calibration data 
+  static AliEMCALRecParam  * fgRecParam ;  //  reconstruction parameters
 
-  ClassDef(AliEMCALLoader,0)  // Algorithm class that provides methods to retrieve objects from a list knowing the index 
+  ClassDef(AliEMCALLoader,1)  // Algorithm class that provides methods to retrieve objects from a list knowing the index 
    
 };