X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDC.h;h=2e33afa9972a536280fbb6602e9a9492f5fb0880;hb=ac84d2fc128fb425e17fcda6ad55d7ec20dbcf99;hp=eb07afc594b63db5c7be1655b3a5c748caf0b81f;hpb=232b622fe222f219e9bafed32c3644306a312c26;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index eb07afc594b..2e33afa9972 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,19 +23,22 @@ 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() {}
-  Int_t         DistancetoPrimitive(Int_t px, Int_t py) const;
   virtual Int_t IsVersion() const =0;
   virtual Float_t ZMin() const;	// Minimum overall dimension of the ZDC
   virtual Float_t ZMax() const;	// Maximum overall dimension of the ZDC
   virtual void  SetTreeAddress();
-  virtual void  MakeBranch(Option_t* opt, const char *file=0);
+  virtual void  MakeBranch(Option_t* opt);
   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
@@ -41,39 +46,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
 };
  
-R__EXTERN  AliZDC *gZDC;
-
-
-// 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();}
-
-// Calibration methods (by Alberto Colla)
+{ 
+  fZDCCalibFName = name;        
+  gSystem->ExpandPathName(fZDCCalibFName);
+}
 
 
 #endif