Updated MUON gentle geometry using recent root version (Bogdan). Checked to work...

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

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 05b3183df7d69b25a228b0cef97e5367d8645180..ff6baa3d1930e88784046351d865a3e568415f27 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -13,9 +13,11 @@
 
 #include "AliDetector.h"
 #include "AliZDCTrigger.h"
+#include "AliZDCChMap.h"
 
 class AliZDCPedestals;
-class AliZDCCalib;
+class AliZDCEnCalib;
+class AliZDCTowCalib;
  
 class AliZDC : public AliDetector {
 
@@ -44,13 +46,28 @@ public:
   // Switching off the shower development in ZDCs
   void  NoShower(){fNoShower=1;}
   void  Shower()  {fNoShower=0;}
-
+  
+  virtual void SetVCollSideCAperture(Float_t /*aperture*/) {}
+  virtual void SetVCollSideCCentre(Float_t /*centre*/) {}
+  
+  virtual void SetVCollSideAAperture(Float_t /*aperture*/) {}
+  virtual void SetVCollSideACentre(Float_t /*centre*/) {}
+  
+  virtual void SetLumiLength(Float_t /*length*/) {}
+  
+  virtual void SetYZNC(Float_t /*yZNC*/) {}
+  virtual void SetYZNA(Float_t /*yZNA*/) {}
+  virtual void SetYZPC(Float_t /*yZPC*/) {}
+  virtual void SetYZPA(Float_t /*yZPA*/) {}
 
   //Calibration methods 
   void    SetZDCCalibFName(const char *name);
   char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
   AliZDCPedestals* GetPedCalib()   const  {return fPedCalib;}
-  AliZDCCalib*     GetECalibData() const  {return fCalibData;}
+  AliZDCEnCalib*   GetECalibData() const  {return fEnCalibData;}
+  
+  // Map from OCDB
+  AliZDCChMap*     GetChMap() const;
 
   // Trigger
   virtual AliTriggerDetector* CreateTriggerDetector() const
@@ -58,7 +75,7 @@ public:
 
   
   void  SetSpectatorsTrack() {fSpectatorTracked=0;}
-  Int_t const SpectatorsTracked() {return fSpectatorTracked;}
+  Int_t SpectatorsTracked() const {return fSpectatorTracked;}
 
 private:
 
@@ -69,14 +86,15 @@ protected:
   Int_t        fNoShower;              // Flag to switch off the shower        
 
   //Calibration data member 
-  AliZDCPedestals* fPedCalib;          // Pedestal data for ZDC
-  AliZDCCalib*     fCalibData;         // Energy and equalization data for ZDC
+  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,8)   // Zero Degree Calorimeter base class
+  ClassDef(AliZDC,10)          // Zero Degree Calorimeter base class
 };
  
 // Calibration