Fixes for running on MC for JetChem, lower limit for p_T of jets in spectrum and...

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

diff --git a/EMCAL/AliEMCALLoader.h b/EMCAL/AliEMCALLoader.h
index 97053fef23f64fd6d675c2c5dfa349d689bedd46..9f9e0a4254ac07042a1a41841f7007f4cff9a29f 100644 (file)
--- a/EMCAL/AliEMCALLoader.h
+++ b/EMCAL/AliEMCALLoader.h
@@ -27,7 +27,8 @@ class TTask ;
 // --- AliRoot header files ---
 #include "AliLoader.h"
 #include "AliEMCALCalibData.h"
-#include "AliEMCALAlignData.h"
+#include "AliCaloCalibPedestal.h"
+#include "AliEMCALSimParam.h"
 
 class AliLoader ;
 class AliEMCAL ; 
@@ -41,19 +42,12 @@ class AliEMCALLoader : public AliLoader {
  public:
 
   AliEMCALLoader();
-  AliEMCALLoader(const AliEMCALLoader & obj):AliLoader(obj){}
   AliEMCALLoader(const Char_t *detname,const Char_t *eventfoldername); 
+  AliEMCALLoader(const Char_t *name,TFolder *topfolder);
   
   virtual ~AliEMCALLoader() ; 
 
-  // assignement operator requested by coding convention, but not needed
-  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(); }
@@ -74,7 +68,7 @@ class AliEMCALLoader : public AliLoader {
 
   // ************    TClonesArrays Access functions
 
-  TClonesArray*  Hits(void) { return fHits;}
+  TClonesArray*  Hits(void) const { return fHits;}
 
   const AliEMCALHit*    Hit(Int_t index) {
     if (fHits)
@@ -82,21 +76,21 @@ class AliEMCALLoader : public AliLoader {
     return 0x0; 
   }
 
-  TClonesArray*  SDigits()  { return fSDigits;}
+  TClonesArray*  SDigits() const { return fSDigits;}
   const AliEMCALDigit*  SDigit(Int_t index)  {
     if (fSDigits)
       return (const AliEMCALDigit*) fSDigits->At(index);
     return 0x0; 
   }
 
-  TClonesArray*   Digits()  { return fDigits;}
+  TClonesArray*   Digits() const { return fDigits;}
   const AliEMCALDigit *  Digit(Int_t index)  {
     if (fDigits)
       return (const AliEMCALDigit*) fDigits->At(index);
     return 0x0; 
   }
 
-  TObjArray * RecPoints()  { return fRecPoints;}
+  TObjArray * RecPoints() const { return fRecPoints;}
   const AliEMCALRecPoint * RecPoint(Int_t index)  {
     if (fRecPoints)
       return (const AliEMCALRecPoint*) fRecPoints->At(index);
@@ -106,16 +100,24 @@ class AliEMCALLoader : public AliLoader {
   void   SetDebug(Int_t level) {fDebug = level;} // Set debug level
 
   //Calibration
-
   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
+       
+  void  SetPedestalData(AliCaloCalibPedestal* caloped)  { fgCaloPed = caloped; }
+  AliCaloCalibPedestal* PedestalData(); // to get the pedestal CDB object
 
+  void  SetSimParam(AliEMCALSimParam* simparam)  { fgSimParam = simparam; }
+  AliEMCALSimParam* SimulationParameters(); // to get the simulation parameter CDB object
+
+       
 private:
  
+  // assignement operator requested by coding convention, but not needed
+  AliEMCALLoader(const AliEMCALLoader &); //Not implemented
+  const AliEMCALLoader & operator = (const AliEMCALLoader &); //Not implemented
+
   static const TString fgkECARecPointsBranchName; //! Name of branch with ECA Reconstructed Points
 
   Int_t  fDebug ;             // Debug level
@@ -128,10 +130,11 @@ 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 AliCaloCalibPedestal * fgCaloPed;    //  dead map
+  static AliEMCALSimParam     * fgSimParam;   //  sim param 
 
-  ClassDef(AliEMCALLoader,0)  // Algorithm class that provides methods to retrieve objects from a list knowing the index 
+  ClassDef(AliEMCALLoader,4)  // Algorithm class that provides methods to retrieve objects from a list knowing the index 
    
 };