calibration function added

[u/mrichter/AliRoot.git] / ZDC / AliZDC.h

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 2f204e105acb75c78a4b77b0330a442bd206ff7b..ceb0829cae9cf970f6ed4661ee210cc3e8174972 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -9,7 +9,10 @@
 //  Manager and classes for set ZDC           //
 ////////////////////////////////////////////////
 
+#include <TSystem.h>
+
 #include "AliDetector.h"
+#include "AliZDCTrigger.h"
 
 class AliZDCCalibData;
  
@@ -23,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();
@@ -39,26 +41,38 @@ public:
   void  Shower()  {fNoShower=0;}
 
 
-//Calibration methods (by Alberto Colla)
-  void          CreateCalibData();
-  void          WriteCalibData(Int_t option=TObject::kOverwrite);
-  void          LoadCalibData();
-  void          SetCalibData(AliZDCCalibData* data) {fCalibData = data;}
+  //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;}
-//Calibration methods (by Alberto Colla)
 
+  // Trigger
+  virtual AliTriggerDetector* CreateTriggerDetector() const
+       {return new AliZDCTrigger();}
 
 protected:
 
   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
+//_____________________________________________________________________________
+inline void AliZDC::SetZDCCalibFName(const char *name)  
+{ 
+  fZDCCalibFName = name;        
+  gSystem->ExpandPathName(fZDCCalibFName);
+}
+
 
 #endif