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

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index a8b98068213..bbd1dc218c1 100644
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -8,9 +8,14 @@
 ////////////////////////////////////////////////
 //  Manager and classes for set ZDC           //
 ////////////////////////////////////////////////
- 
+
+#include <TSystem.h>
+
 #include "AliDetector.h"
+#include "AliZDCTrigger.h"
 
+class AliZDCPedestals;
+class AliZDCCalib;
  
 class AliZDC : public AliDetector {
 
@@ -18,55 +23,64 @@ 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);
   virtual Int_t IsVersion() const =0;
-  virtual void  StepManager();
-  virtual void  ResetDigits(); 
-  
+  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);
+  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
-  virtual void  NoShower(){fNoShower=1;}
-  virtual void  Shower()  {fNoShower=0;}
-  
+  void  NoShower(){fNoShower=1;}
+  void  Shower()  {fNoShower=0;}
+
+
+  //Calibration methods 
+  void    SetZDCCalibFName(const char *name);
+  char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
+  AliZDCPedestals* GetPedCalib()   const  {return fPedCalib;}
+  AliZDCCalib*     GetECalibData() const  {return fCalibData;}
+
+  // Trigger
+  virtual AliTriggerDetector* CreateTriggerDetector() const
+  	{return new AliZDCTrigger();}
+
+private:
+
+  AliZDC& operator = (const AliZDC&);
+
 protected:
 
-  // Parameters for hadronic calorimeters geometry
-  Float_t fDimZN[3];  // Dimensions of neutron detector
-  Float_t fDimZP[3];  // Dimensions of proton detector
-  Float_t fPosZN[3];  // Position of neutron detector
-  Float_t fPosZP[3];  // Position of proton detector
-  Float_t fFibZN[3];  // Fibers for neutron detector
-  Float_t fFibZP[3];  // Fibers for proton detector
-  Float_t fGrvZN[3];  // Grooves for neutron detector
-  Float_t fGrvZP[3];  // Grooves for proton detector
-  Int_t   fDivZN[3];  // Division for neutron detector
-  Int_t   fDivZP[3];  // Division for proton detector
-  Int_t   fTowZN[2];  // Tower for neutron detector
-  Int_t   fTowZP[2];  // Tower for proton detector
-
-  // Parameters for EM calorimeter geometry
-  Float_t fDimZEMPb;  // z-dimension of the Pb slice
-  Float_t fDimZEMAir; // scotch
-  Float_t fFibRadZEM; // External fiber radius (including cladding)
-  Float_t fFibZEM[3]; // Fibers for EM calorimeter
-  Float_t fDimZEM[6]; // Dimensions of EM detector
-  Float_t fPosZEM[3]; // Position of EM detector
-  Int_t   fDivZEM[3]; // Divisions for EM detector
-  
-  // TClonesArray of stored hits -> not reset et finish event
-  // 	(for digitization at the end of the event)
-  TClonesArray *fStHits;
-  Int_t fNStHits;
-  
-  Int_t   fNPrimaryHits;
+  Int_t        fNoShower;		// Flag to switch off the shower	
 
-  //Flag to switch off the shower
-  Int_t   fNoShower;
+  //Calibration data member 
+  AliZDCPedestals* fPedCalib;		// Pedestal data for ZDC
+  AliZDCCalib*     fCalibData;		// Energy and equalization data for ZDC
 
-   ClassDef(AliZDC,1)  // Zero Degree Calorimeter base class
+  TString          fZDCCalibFName; 	// Name of the ZDC calibration data
+  
+  ClassDef(AliZDC,7)  	// Zero Degree Calorimeter base class
 };
  
+// Calibration
+//_____________________________________________________________________________
+inline void AliZDC::SetZDCCalibFName(const char *name)  
+{ 
+  fZDCCalibFName = name;        
+  gSystem->ExpandPathName(fZDCCalibFName);
+}
+
+
 #endif