X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCReconstructor.h;h=180edfc2adcd650254eed3f888099b9d1deff928;hb=3eef419b665d86a5855d3085661e49420e362609;hp=fd8b0f2b8e7c5300f978afb2859fc794c0a6e230;hpb=81f091623d62ee5ef34aa53fa2351d3a9331627b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCReconstructor.h b/ZDC/AliZDCReconstructor.h
index fd8b0f2b8e7..180edfc2adc 100644
--- a/ZDC/AliZDCReconstructor.h
+++ b/ZDC/AliZDCReconstructor.h
@@ -12,16 +12,17 @@
 /////////////////////////////////////////////
 
 #include "AliReconstructor.h"
-#include "AliCDBManager.h"
-#include "AliCDBStorage.h"
-#include "AliZDCPedestals.h"
-#include "AliZDCEnCalib.h"
-#include "AliZDCTowerCalib.h"
 #include "AliZDCRecoParam.h"
-#include "AliZDCRecoParampp.h"
-#include "AliZDCRecoParamPbPb.h"
-#include "AliLog.h"
 
+class AliCDBManager;
+class AliCDBStorage;
+class AliZDCPedestals;
+class AliZDCEnCalib;
+class AliZDCTowerCalib;
+class AliZDCMBCalib;
+class AliZDCRecoParampp;
+class AliZDCRecoParamPbPb;
+class AliLog;
 class AliLoader;
 
 class AliZDCReconstructor: public AliReconstructor {
@@ -32,35 +33,38 @@ public:
   virtual void   Init();
   virtual Bool_t HasDigitConversion() const {return kFALSE;};
   
-  virtual void Reconstruct(TTree* digitsTree, TTree* clustersTree) const; 
+  virtual void Reconstruct(TTree*digitsTree, TTree* clustersTree) const; 
   virtual void Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const;
 
-  virtual void FillESD(TTree* /*digitsTree*/, TTree* clustersTree, AliESDEvent* esd) const 
-  	        {FillZDCintoESD(clustersTree, esd);}
-  virtual void FillESD(AliRawReader* /*rawReader*/, TTree* clustersTree, AliESDEvent* esd) const 
-  	        {FillZDCintoESD(clustersTree, esd);}
+  virtual void FillESD(TTree* /*digitsTree*/, TTree* clustersTree, 
+  		       AliESDEvent* esd) const {FillZDCintoESD(clustersTree, esd);}
+  virtual void FillESD(AliRawReader* /*rawReader*/, TTree* clustersTree, 
+		       AliESDEvent* esd) const {FillZDCintoESD(clustersTree, esd);}
   
   // parameter settings for reconstruction
   void SetRecoMode(Int_t recoMode, Float_t beamEnergy) 
-  		  {fRecoMode=recoMode; fBeamEnergy=beamEnergy;}
-  static void SetRecoParam(AliZDCRecoParam * param){fRecoParam = param;}
+       {fRecoMode=recoMode; fBeamEnergy=beamEnergy;}
+  static void SetRecoParam(AliZDCRecoParam * const param)
+  	      {fgRecoParam = param;}
   
-  Int_t   GetRecoMode() {return fRecoMode;}
-  Float_t GetBeamEnergy() {return fBeamEnergy;}
+  Int_t   GetRecoMode() const {return fRecoMode;}
+  Float_t GetBeamEnergy() const {return fBeamEnergy;}
   
-  static const AliZDCRecoParam* GetRecoParam() {return dynamic_cast<const AliZDCRecoParam*>(AliReconstructor::GetRecoParam(9));}
+  static const AliZDCRecoParam* GetRecoParam() 
+  {return dynamic_cast<const AliZDCRecoParam*>(AliReconstructor::GetRecoParam(9));}
     
   void  SetPedSubMode(Int_t pedsubMode) {fPedSubMode=pedsubMode;}
-  Int_t GetPedSubMode() {return fPedSubMode;}
+  Int_t GetPedSubMode() const {return fPedSubMode;}
   
   void    SetSignalThreshold(Float_t val) {fSignalThreshold=val;}
-  Float_t GetSignalThreshold() {return fSignalThreshold;}
+  Float_t GetSignalThreshold() const {return fSignalThreshold;}
   
   // OCDB objects for reconstruction
   AliCDBStorage       *SetStorage(const char* uri);
   AliZDCPedestals     *GetPedestalData() const; 
   AliZDCEnCalib       *GetEnergyCalibData() const; 
   AliZDCTowerCalib    *GetTowerCalibData() const; 
+  AliZDCMBCalib       *GetMBCalibData() const; 
   AliZDCRecoParampp   *GetppRecoParamFromOCDB() const;  
   AliZDCRecoParamPbPb *GetPbPbRecoParamFromOCDB() const;  
   
@@ -69,24 +73,28 @@ private:
   AliZDCReconstructor& operator =(const AliZDCReconstructor&); //Not implemented
 
   void   ReconstructEventpp(TTree *clustersTree, 
-  	    Float_t* ZN1ADCCorr, Float_t* ZP1ADCCorr, Float_t* ZN2ADCCorr, Float_t* ZP2ADCCorr,
-	    Float_t* ZEM1ADCCorr, Float_t* ZEM2ADCCorr, Float_t* PMRef1, Float_t* PMRef2,
-	    Bool_t isScalerOn, UInt_t* scaler, 
-	    Int_t* evQualityBlock, Int_t* triggerBlock, Int_t* chBlock, UInt_t puBits) const;
+	 const Float_t* const corrADCZN1, const Float_t* const corrADCZP1, 
+	 const Float_t* const corrADCZN2, const Float_t* const corrADCZP2,
+	 const Float_t* const corrADCZEM1, const Float_t* const corrADCZEM2,
+	 Float_t* sPMRef1, Float_t* sPMRef2, Bool_t isScalerOn, UInt_t* scaler, 
+	 const Int_t* const evQualityBlock, const Int_t* const triggerBlock, 
+	 const Int_t* const chBlock, UInt_t puBits) const;
   void   ReconstructEventPbPb(TTree *clustersTree, 
-  	    Float_t* ZN1ADCCorr, Float_t* ZP1ADCCorr, Float_t* ZN2ADCCorr, Float_t* ZP2ADCCorr,
-	    Float_t* ZEM1ADCCorr, Float_t* ZEM2ADCCorr, Float_t* PMRef1, Float_t* PMRef2,
-	    Bool_t isScalerOn, UInt_t* scaler, 
-	    Int_t* evQualityBlock, Int_t* triggerBlock, Int_t* chBlock, UInt_t puBits) const;
-  void   BuildRecoParam(Float_t ZDCC, Float_t ZDCA, Float_t ZEM) const;
+	 const Float_t* const corrADCZN1, const Float_t* const corrADCZP1, 
+	 const Float_t* const corrADCZN2, const Float_t* const corrADCZP2,
+	 const Float_t* const corrADCZEM1, const Float_t* const corrADCZEM2,
+	 Float_t* sPMRef1, Float_t* sPMRef2, Bool_t isScalerOn, UInt_t* scaler, 
+	 const Int_t* const evQualityBlock, const Int_t* const triggerBlock, 
+	 const Int_t* const chBlock, UInt_t puBits) const;
   
   void   FillZDCintoESD(TTree *clustersTree, AliESDEvent*esd) const;
 
-  static AliZDCRecoParam *fRecoParam; // reconstruction parameters
+  static AliZDCRecoParam *fgRecoParam; // reconstruction parameters
 
-  AliZDCPedestals  *fPedData; 	    //! pedestal calibration data
-  AliZDCEnCalib    *fEnCalibData;   //! energy calibration data
-  AliZDCTowerCalib *fTowCalibData;  //! equalization calibration data
+  static AliZDCMBCalib   *fgMBCalibData;   //! mb calibration data
+  AliZDCPedestals  *fPedData; 	    	  //! pedestal calibration data
+  AliZDCEnCalib    *fEnCalibData;   	  //! energy calibration data
+  AliZDCTowerCalib *fTowCalibData;  	  //! equalization calibration data
   
   Int_t   fRecoMode;	    // =1->p-p, =2->A-A
   Float_t fBeamEnergy;	    // beam energy
@@ -95,7 +103,7 @@ private:
   Int_t   fPedSubMode;	    // =0->mean values, =1->from correlations
   Float_t fSignalThreshold; // Threshold value for "triggering" in p-p
 
-  ClassDef(AliZDCReconstructor, 9)   // class for the ZDC reconstruction
+  ClassDef(AliZDCReconstructor, 10)   // class for the ZDC reconstruction
 };
 
 #endif