X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDC.h;h=25edd9a4df38d30bc87d5a47104cdc63478aee7f;hb=637206e1b98f0a73e8dc774dccb392a7c015320b;hp=8e0b2a269842eb742f5f06e58699edca65f6a14c;hpb=8a2624cc301a4bd98b89b9a157086ab802486d48;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 8e0b2a26984..25edd9a4df3 100644
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -14,7 +14,9 @@
 #include "AliDetector.h"
 #include "AliZDCTrigger.h"
 
-class AliZDCCalibData;
+class AliZDCPedestals;
+class AliZDCEnCalib;
+class AliZDCTowCalib;
  
 class AliZDC : public AliDetector {
 
@@ -22,8 +24,9 @@ public:
   AliZDC();
   AliZDC(const char *name, const char *title);
   virtual       ~AliZDC();
+  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;
@@ -34,6 +37,9 @@ 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
@@ -44,26 +50,35 @@ public:
   //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;}
 
   // Trigger
   virtual AliTriggerDetector* CreateTriggerDetector() const
   	{return new AliZDCTrigger();}
 
+  
+  void  SetSpectatorsTrack() {fSpectatorTracked=0;}
+  Int_t SpectatorsTracked() const {return fSpectatorTracked;}
+
+private:
+
+  AliZDC& operator = (const AliZDC&);
+
 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,9)  	// Zero Degree Calorimeter base class
 };
  
 // Calibration