X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDC.h;h=bbd1dc218c1a9f316ed9d1301f8ce08c47199b11;hb=f8fa4595db0ba0c2e08f2d4106f4cb833545d0e8;hp=6e1ae7562522e7053459eca39e27224b95784ea6;hpb=90001c80cf0039cf0ebe611e970b9913190a88b1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 6e1ae756252..bbd1dc218c1 100644
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -14,7 +14,8 @@
 #include "AliDetector.h"
 #include "AliZDCTrigger.h"
 
-class AliZDCCalibData;
+class AliZDCPedestals;
+class AliZDCCalib;
  
 class AliZDC : public AliDetector {
 
@@ -38,8 +39,7 @@ public:
   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, Float_t ADCVal, 
-                    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
@@ -50,12 +50,8 @@ 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;}
+  AliZDCCalib*     GetECalibData() const  {return fCalibData;}
 
   // Trigger
   virtual AliTriggerDetector* CreateTriggerDetector() const
@@ -70,10 +66,12 @@ 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
+  AliZDCCalib*     fCalibData;		// Energy and equalization data for ZDC
+
+  TString          fZDCCalibFName; 	// Name of the ZDC calibration data
   
-  ClassDef(AliZDC,5)  	// Zero Degree Calorimeter base class
+  ClassDef(AliZDC,7)  	// Zero Degree Calorimeter base class
 };
  
 // Calibration