Updated calibration object

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

diff --git a/ZDC/AliZDCReconstructor.h b/ZDC/AliZDCReconstructor.h
index 7d42e26eb6fc3318191e3ac850ecd1550817fa28..07dbf13f56f5f49967009ab958906b1df8a91f9f 100644 (file)
--- a/ZDC/AliZDCReconstructor.h
+++ b/ZDC/AliZDCReconstructor.h
@@ -15,6 +15,7 @@
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
 #include "AliZDCCalibData.h"
+#include "AliLog.h"
 
 class TF1;
 class AliLoader;
@@ -24,30 +25,44 @@ public:
   AliZDCReconstructor();
   virtual ~AliZDCReconstructor();
 
-  virtual void   Reconstruct(AliRunLoader* runLoader) const;
-  virtual void   Reconstruct(AliRunLoader* runLoader,
-                 AliRawReader* rawReader) const;
-  virtual void   Reconstruct(TTree* digitsTree, TTree* clustersTree) const 
-                 {AliReconstructor::Reconstruct(digitsTree,clustersTree);}
-  virtual void   Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const 
-                 {AliReconstructor::Reconstruct(rawReader,clustersTree);}
-  virtual void   FillESD(AliRunLoader* runLoader, AliESD* esd) const;
-  virtual void   FillESD(TTree* digitsTree, TTree* clustersTree, AliESD* esd) const 
-                 {AliReconstructor::FillESD(digitsTree,clustersTree,esd);}
-  virtual void   FillESD(AliRawReader* rawReader, TTree* clustersTree, AliESD* esd) const 
-                 {AliReconstructor::FillESD(rawReader,clustersTree,esd);}
-  virtual void   FillESD(AliRunLoader* runLoader, AliRawReader* rawReader, AliESD* esd) const 
-                 {AliReconstructor::FillESD(runLoader,rawReader,esd);}
+  virtual Bool_t HasDigitConversion() const {return kFALSE;}
+  virtual Bool_t HasLocalReconstruction() const {return kTRUE;}
+
+  virtual void Reconstruct(TTree* digitsTree, TTree* clustersTree) const; 
+  virtual void Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const;
+
+  // Not used
+  virtual void Reconstruct(AliRunLoader* /*runLoader*/) const
+    { AliError("Method should not be used anymore !"); }
+  virtual void Reconstruct(AliRunLoader* /*runLoader*/, 
+                          AliRawReader* /*rawReader*/) const
+    { AliError("Method should not be used anymore !"); }
+
+  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);}
+  
+  // Not used
+  virtual void FillESD(AliRunLoader* /*runLoader*/, AliESDEvent* /*esd*/) const
+    { AliError("Method should not be used anymore !"); }
+  virtual void FillESD(AliRunLoader* /*runLoader*/, 
+                      AliRawReader* /*rawReader*/, AliESDEvent* /*esd*/) const
+    { AliError("Method should not be used anymore !"); }
   
-  void   GetStorage(const char* uri) {fStorage = AliCDBManager::Instance()->GetStorage(uri);}
   AliCDBStorage   *SetStorage(const char* uri);
-  AliZDCCalibData *GetCalibData(int runNumber) const; 
-
+  AliZDCCalibData *GetCalibData() const; 
+  
 private:
-  AliZDCReconstructor(const AliZDCReconstructor& reconstructor);
-  AliZDCReconstructor& operator = (const AliZDCReconstructor& reconstructor);
+  AliZDCReconstructor(const AliZDCReconstructor&);
+  AliZDCReconstructor& operator =(const AliZDCReconstructor&);
 
-  void   ReconstructEvent(AliLoader* loader, Float_t zncorr, Float_t zpcorr, Float_t zemcorr) const;
+  void   ReconstructEvent(TTree *clustersTree, Float_t* ZN1ADCCorrHG, 
+               Float_t* ZP1ADCCorrHG, Float_t* ZN2ADCCorrHG, 
+               Float_t* ZP2ADCCorrHG, Float_t* ZN1ADCCorrLG, 
+               Float_t* ZP1ADCCorrLG, Float_t* ZN2ADCCorrLG, 
+               Float_t* ZP2ADCCorrLG, Float_t ZEMADCCorrHG) const;
+  void   FillZDCintoESD(TTree *clustersTree, AliESDEvent*esd) const;
 
   TF1*   fZNCen;     //! Nspectator n true vs. EZN
   TF1*   fZNPer;     //! Nspectator n true vs. EZN
@@ -62,10 +77,9 @@ private:
   TF1*   fZEMsp;     //! Nspectators from ZEM energy
   TF1*   fZEMb;      //! b from ZEM energy
   
-  AliCDBStorage *fStorage;     //! storage
   AliZDCCalibData *fCalibData;         //! calibration data
 
-  ClassDef(AliZDCReconstructor, 1)   // class for the ZDC reconstruction
+  ClassDef(AliZDCReconstructor, 2)   // class for the ZDC reconstruction
 };
 
 #endif