X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ZDC%2FAliZDC.h;h=bbd1dc218c1a9f316ed9d1301f8ce08c47199b11;hp=6dd75373ef522bbaeba8d43a9272478dffb6a3ea;hb=f0b0fc1ad6909503eff8c9ac940a23cc59e2735d;hpb=5bc762ca3d0cf908d97b92237f8c9796431f6af5

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 6dd75373ef5..bbd1dc218c1 100644
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -12,8 +12,10 @@
 #include <TSystem.h>
 
 #include "AliDetector.h"
+#include "AliZDCTrigger.h"
 
-class AliZDCCalibData;
+class AliZDCPedestals;
+class AliZDCCalib;
  
 class AliZDC : public AliDetector {
 
@@ -21,6 +23,8 @@ 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() {}
@@ -33,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
@@ -40,34 +47,40 @@ public:
   void  Shower()  {fNoShower=0;}
 
 
-//Calibration methods (by Alberto Colla)
-  void    SetZDCCalibFName(const char *name="$(ALICE)/AliRoot/data/AliZDCCalib.root");
-  char*   GetZDCCalibFName() const;
+  //Calibration methods 
+  void    SetZDCCalibFName(const char *name);
+  char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
+  AliZDCPedestals* GetPedCalib()   const  {return fPedCalib;}
+  AliZDCCalib*     GetECalibData() const  {return fCalibData;}
 
-  void    CreateCalibData();
-  void    WriteCalibData(Int_t option=TObject::kOverwrite);
-  void    LoadCalibData();
-  void    SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
-  AliZDCCalibData* GetCalibData() const  {return fCalibData;}
+  // Trigger
+  virtual AliTriggerDetector* CreateTriggerDetector() const
+  	{return new AliZDCTrigger();}
 
+private:
+
+  AliZDC& operator = (const AliZDC&);
 
 protected:
 
-  Int_t        fNoShower;	// Flag to switch off the shower	
+  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
 
-//Calibration methods (by Alberto Colla)
-  AliZDCCalibData* fCalibData;		// Calibration data for ZDC
-  TString          fZDCCalibFName; 	//  Name of the ZDC calibration data
+  TString          fZDCCalibFName; 	// Name of the ZDC calibration data
   
-  ClassDef(AliZDC,4)  	// Zero Degree Calorimeter base class
+  ClassDef(AliZDC,7)  	// Zero Degree Calorimeter base class
 };
  
-// Calibration methods (by Alberto Colla)
+// Calibration
 //_____________________________________________________________________________
 inline void AliZDC::SetZDCCalibFName(const char *name)  
-{fZDCCalibFName = name;        gSystem->ExpandPathName(fZDCCalibFName);}
-//_____________________________________________________________________________
-inline char* AliZDC::GetZDCCalibFName()  const {return (char*)fZDCCalibFName.Data();}
+{ 
+  fZDCCalibFName = name;        
+  gSystem->ExpandPathName(fZDCCalibFName);
+}
 
 
 #endif