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 97053fef23f64fd6d675c2c5dfa349d689bedd46..bd361cad85f2c82bf05d71ff5a7669dbc7503b1e 100644 (file)
--- a/EMCAL/AliEMCALLoader.h
+++ b/EMCAL/AliEMCALLoader.h
@@ -27,7 +27,7 @@ class TTask ;
 // --- AliRoot header files ---
 #include "AliLoader.h"
 #include "AliEMCALCalibData.h"
-#include "AliEMCALAlignData.h"
+#include "AliEMCALRecParam.h"
 
 class AliLoader ;
 class AliEMCAL ; 
@@ -41,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() ; 
 
@@ -50,10 +51,6 @@ class AliEMCALLoader : public AliLoader {
   const AliEMCALLoader & operator = (const AliEMCALLoader & ) {return *this;}
 
   virtual Int_t GetEvent();  // Overload to fill TClonesArray
-  virtual Int_t LoadHits(Option_t* opt);  // Overload to fill TClonesArray
-  virtual Int_t LoadSDigits(Option_t* opt); // Overload to fill TClonesArray
-  virtual Int_t LoadDigits(Option_t* opt); // Overload to fill TClonesArray
-  virtual Int_t LoadRecPoints(Option_t* opt); // Overload to fill TClonesArray
 
   virtual void    CleanHits() const 
     { if (fHits) fHits->Clear(); AliLoader::CleanHits(); }
@@ -109,11 +106,11 @@ class AliEMCALLoader : public AliLoader {
 
   Int_t CalibrateRaw (Double_t energy, Int_t module, Int_t column, Int_t row);//take real calibration coefficients
   
-  void  SetAlignData(AliEMCALAlignData* alignda)  { fAlignData = alignda; } 
-  void  SetCalibData(AliEMCALCalibData* calibda)  { fCalibData = calibda; }
-  AliEMCALAlignData * AlignData(); // to get the alignment 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:
  
   static const TString fgkECARecPointsBranchName; //! Name of branch with ECA Reconstructed Points
@@ -128,10 +125,10 @@ private:
   TClonesArray     *fSDigits;      //! TClonesArray of sdigits (for tree reading)
   TObjArray        *fRecPoints;    //! TClonesArray of recpoints (for tree reading)   
   
-  static AliEMCALAlignData * fAlignData;
-  static AliEMCALCalibData * fCalibData;  //  calibration data 
+  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 
    
 };