Change in comment

[u/mrichter/AliRoot.git] / ZDC / AliZDCReconstructor.h

diff --git a/ZDC/AliZDCReconstructor.h b/ZDC/AliZDCReconstructor.h
index 180edfc2adcd650254eed3f888099b9d1deff928..7c1aaeee816d44685a16ab7f1b2fe939e241a1cd 100644 (file)
--- a/ZDC/AliZDCReconstructor.h
+++ b/ZDC/AliZDCReconstructor.h
@@ -13,13 +13,16 @@
 
 #include "AliReconstructor.h"
 #include "AliZDCRecoParam.h"
+#include "AliESDZDC.h"
 
 class AliCDBManager;
 class AliCDBStorage;
 class AliZDCPedestals;
 class AliZDCEnCalib;
+class AliZDCSaturationCalib;
 class AliZDCTowerCalib;
 class AliZDCMBCalib;
+class AliZDCTDCCalib;
 class AliZDCRecoParampp;
 class AliZDCRecoParamPbPb;
 class AliLog;
@@ -31,6 +34,7 @@ public:
   virtual ~AliZDCReconstructor();
 
   virtual void   Init();
+  virtual void   Init(TString beamType, Float_t beamEnergy);
   virtual Bool_t HasDigitConversion() const {return kFALSE;};
   
   virtual void Reconstruct(TTree*digitsTree, TTree* clustersTree) const; 
@@ -41,6 +45,8 @@ public:
   virtual void FillESD(AliRawReader* /*rawReader*/, TTree* clustersTree, 
                       AliESDEvent* esd) const {FillZDCintoESD(clustersTree, esd);}
   
+  void   FillZDCintoESD(TTree *clustersTree, AliESDEvent *esd) const;
+  
   // parameter settings for reconstruction
   void SetRecoMode(Int_t recoMode, Float_t beamEnergy) 
        {fRecoMode=recoMode; fBeamEnergy=beamEnergy;}
@@ -50,6 +56,8 @@ public:
   Int_t   GetRecoMode() const {return fRecoMode;}
   Float_t GetBeamEnergy() const {return fBeamEnergy;}
   
+  AliESDZDC* GetZDCESDData() const {return fESDZDC;}
+  
   static const AliZDCRecoParam* GetRecoParam() 
   {return dynamic_cast<const AliZDCRecoParam*>(AliReconstructor::GetRecoParam(9));}
     
@@ -63,10 +71,10 @@ public:
   AliCDBStorage       *SetStorage(const char* uri);
   AliZDCPedestals     *GetPedestalData() const; 
   AliZDCEnCalib       *GetEnergyCalibData() const; 
+  AliZDCSaturationCalib *GetSaturationCalibData() const; 
   AliZDCTowerCalib    *GetTowerCalibData() const; 
   AliZDCMBCalib       *GetMBCalibData() const; 
-  AliZDCRecoParampp   *GetppRecoParamFromOCDB() const;  
-  AliZDCRecoParamPbPb *GetPbPbRecoParamFromOCDB() const;  
+  AliZDCTDCCalib      *GetTDCCalibData() const; 
   
 private:
   AliZDCReconstructor(const AliZDCReconstructor&); //Not implemented
@@ -77,33 +85,36 @@ private:
         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;
+        Int_t tdcData[32][4], const Int_t* const evQualityBlock, 
+        const Int_t* const triggerBlock, const Int_t* const chBlock, UInt_t puBits) const;
   void   ReconstructEventPbPb(TTree *clustersTree, 
         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;
+        Int_t tdcData[32][4], const Int_t* const evQualityBlock, 
+        const Int_t* const triggerBlock, const Int_t* const chBlock, UInt_t puBits) const;
 
   static AliZDCRecoParam *fgRecoParam; // reconstruction parameters
 
   static AliZDCMBCalib   *fgMBCalibData;   //! mb calibration data
   AliZDCPedestals  *fPedData;            //! pedestal calibration data
   AliZDCEnCalib    *fEnCalibData;        //! energy calibration data
+  AliZDCSaturationCalib  *fSatCalibData;         //! energy calibration data
   AliZDCTowerCalib *fTowCalibData;       //! equalization calibration data
+  AliZDCTDCCalib   *fTDCCalibData;       //! TDC offset data
+  
+  Int_t    fRecoMode;      // =1->p-p, =2->A-A
+  Float_t  fBeamEnergy;            // beam energy
+  Int_t           fNRun;           // Run Number (from raw data)
+  Bool_t   fIsCalibrationMB; // true if run type = "CALIBRATION_MB"
+  Int_t    fPedSubMode;            // =0->mean values, =1->from correlations
+  Float_t  fSignalThreshold; // Threshold value for "triggering" in p-p
+  Double_t fMeanPhase;      // LHC clock phase
   
-  Int_t   fRecoMode;       // =1->p-p, =2->A-A
-  Float_t fBeamEnergy;     // beam energy
-  Int_t          fNRun;            // Run Number (from raw data)
-  Bool_t  fIsCalibrationMB; // true if run type = "CALIBRATION_MB"
-  Int_t   fPedSubMode;     // =0->mean values, =1->from correlations
-  Float_t fSignalThreshold; // Threshold value for "triggering" in p-p
+  AliESDZDC* fESDZDC;       // ESD output object  
 
-  ClassDef(AliZDCReconstructor, 10)   // class for the ZDC reconstruction
+  ClassDef(AliZDCReconstructor, 14)   // class for the ZDC reconstruction
 };
 
 #endif