Index corrected in AliZDCReconstructor.cxx + getting rid of unused calib object in...

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

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index f279c3103eb035ff5cbbfd3f11622ff57dda1fc7..ee8878634a2c775bc7f6eadb79d15f059629d963 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -13,8 +13,11 @@
 
 #include "AliDetector.h"
 #include "AliZDCTrigger.h"
+#include "AliZDCChMap.h"
 
-class AliZDCCalibData;
+class AliZDCPedestals;
+class AliZDCEnCalib;
+class AliZDCTowCalib;
  
 class AliZDC : public AliDetector {
 
@@ -25,7 +28,6 @@ public:
   AliZDC(const AliZDC&);
   //
   virtual void  AddHit(Int_t track, Int_t *vol, Float_t *hits);
-  virtual void  BuildGeometry();
   virtual void  CreateGeometry() {}
   virtual void  CreateMaterials() {}
   virtual Int_t IsVersion() const =0;
@@ -36,27 +38,36 @@ public:
   virtual void  Hits2SDigits();
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
   virtual void  Digits2Raw();
+  virtual Bool_t Raw2SDigits(AliRawReader* rawReader);
+  Int_t   Pedestal(Int_t Detector, Int_t Quadrant, Int_t Res) const;
+  Int_t   ADCch2Phe(Int_t Detector, Int_t Quadrant, Int_t ADCVal, Int_t Res) const;
   virtual void  StepManager() {}
     
   // Switching off the shower development in ZDCs
   void  NoShower(){fNoShower=1;}
   void  Shower()  {fNoShower=0;}
-
+  
+  virtual void SetVCollAperture(Float_t /*aperture*/) {}
+  virtual void SetVCollCentre(Float_t /*centre*/) {}
+  virtual void SetLumiLength(Float_t /*length*/) {}
 
   //Calibration methods 
   void    SetZDCCalibFName(const char *name);
   char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
-
-  void    CreateCalibData();
-  void    WriteCalibData(Int_t option=TObject::kOverwrite);
-  void    LoadCalibData();
-  void    SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
-  AliZDCCalibData* GetCalibData() const  {return fCalibData;}
+  AliZDCPedestals* GetPedCalib()   const  {return fPedCalib;}
+  AliZDCEnCalib*   GetECalibData() const  {return fEnCalibData;}
+  
+  // Map from OCDB
+  AliZDCChMap*     GetChMap() const;
 
   // Trigger
   virtual AliTriggerDetector* CreateTriggerDetector() const
        {return new AliZDCTrigger();}
 
+  
+  void  SetSpectatorsTrack() {fSpectatorTracked=0;}
+  Int_t SpectatorsTracked() const {return fSpectatorTracked;}
+
 private:
 
   AliZDC& operator = (const AliZDC&);
@@ -66,10 +77,15 @@ protected:
   Int_t        fNoShower;              // Flag to switch off the shower        
 
   //Calibration data member 
-  AliZDCCalibData* fCalibData;         // Calibration data for ZDC
-  TString          fZDCCalibFName;     //  Name of the ZDC calibration data
+  AliZDCPedestals* fPedCalib;          //! Pedestal data for ZDC
+  AliZDCEnCalib*   fEnCalibData;       //! Energy data for ZDC
+  AliZDCTowCalib*  fTowCalibData;      //! Equalization data for ZDC
+
+  TString          fZDCCalibFName;     // Name of the ZDC calibration data
+ 
+  Int_t fSpectatorTracked; // Are spectator tracked by generator?
   
-  ClassDef(AliZDC,5)   // Zero Degree Calorimeter base class
+  ClassDef(AliZDC,10)          // Zero Degree Calorimeter base class
 };
  
 // Calibration