X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=ZDC%2FAliZDC.h;h=8e0b2a269842eb742f5f06e58699edca65f6a14c;hp=8572b0c51439e304737e97679e0c825023de2b40;hb=74b154bd31f90ab1fbb95614f49420cb3164afe5;hpb=4d81e5e71462d9da2ef4ee054715df68ee5a850f

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 8572b0c5143..8e0b2a26984 100644
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -12,6 +12,7 @@
 #include <TSystem.h>
 
 #include "AliDetector.h"
+#include "AliZDCTrigger.h"
 
 class AliZDCCalibData;
  
@@ -25,12 +26,11 @@ public:
   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 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();
@@ -41,44 +41,38 @@ public:
   void  Shower()  {fNoShower=0;}
 
 
-//Calibration methods (by Alberto Colla)
-// Albe
+  //Calibration methods 
+  void    SetZDCCalibFName(const char *name);
+  char*   GetZDCCalibFName() const {return (char*)fZDCCalibFName.Data();}
 
-public:
-  void SetZDCCalibFName(const char *name="$(ALICE)/AliRoot/data/AliZDCCalib.root");
-  char* GetZDCCalibFName() const;
-  TString       fZDCCalibFName;      //  Name of the ZDC calibration data
-
-  void          CreateCalibData();
-  void          WriteCalibData(Int_t option=TObject::kOverwrite);
-  void          LoadCalibData();
-  void          SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
+  void    CreateCalibData();
+  void    WriteCalibData(Int_t option=TObject::kOverwrite);
+  void    LoadCalibData();
+  void    SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
   AliZDCCalibData* GetCalibData() const  {return fCalibData;}
-//Calibration methods (by Alberto Colla)
 
+  // Trigger
+  virtual AliTriggerDetector* CreateTriggerDetector() const
+  	{return new AliZDCTrigger();}
 
 protected:
 
-  Int_t        fNoShower;	// Flag to switch off the shower	
+  Int_t        fNoShower;		// Flag to switch off the shower	
 
-//Calibration methods (by Alberto Colla)
-  AliZDCCalibData* fCalibData;	// Calibration data for ZDC
-//Calibration methods (by Alberto Colla)
+  //Calibration data member 
+  AliZDCCalibData* fCalibData;		// Calibration data for ZDC
+  TString          fZDCCalibFName; 	//  Name of the ZDC calibration data
   
-  ClassDef(AliZDC,4)  	// Zero Degree Calorimeter base class
+  ClassDef(AliZDC,5)  	// 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