Removing unuseful prints

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

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 3494becfe8fc8da71ed99d314ff39203268107b4..0855e84de4b2025a77b87f643349dd38d72176dc 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -13,10 +13,11 @@
 
 #include "AliDetector.h"
 #include "AliZDCTrigger.h"
+#include "AliZDCChMap.h"
 
 class AliZDCPedestals;
-class AliZDCCalib;
-class AliZDCRecParam;
+class AliZDCEnCalib;
+class AliZDCTowCalib;
  
 class AliZDC : public AliDetector {
 
@@ -27,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;
@@ -52,13 +52,19 @@ public:
   void    SetZDCCalibFName(const char *name);
   char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
   AliZDCPedestals* GetPedCalib()   const  {return fPedCalib;}
-  AliZDCCalib*     GetECalibData() const  {return fCalibData;}
-  AliZDCRecParam*  GetRecParams()  const  {return fRecParam;}
+  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&);
@@ -68,12 +74,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
-  AliZDCRecParam*  fRecParam;          // Parameters for reconstruction 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,6)   // Zero Degree Calorimeter base class
+  ClassDef(AliZDC,10)          // Zero Degree Calorimeter base class
 };
  
 // Calibration