Minor changes

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

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 12e5aaf6859ec627192af885a5d32f44356ffef8..2e33afa9972a536280fbb6602e9a9492f5fb0880 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -9,9 +9,13 @@
 //  Manager and classes for set ZDC           //
 ////////////////////////////////////////////////
 
-class AliZDCMerger;
- 
+#include <TSystem.h>
+
 #include "AliDetector.h"
+#include "AliZDCTrigger.h"
+
+class AliZDCPedestals;
+class AliZDCCalib;
  
 class AliZDC : public AliDetector {
 
@@ -19,44 +23,63 @@ 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  AddDigit(Int_t *sector, Int_t digit);
-  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  MakeBranch(Option_t* opt, const char *file=0);
-  virtual void  MakeBranchInTreeSD(TTree *treeSD, const char *file=0);
-  virtual void  MakeBranchInTreeD(TTree *treeD, const char *file=0);
+  virtual void  SetTreeAddress();
+  virtual void  MakeBranch(Option_t* opt);
   virtual void  Hits2SDigits();
-  virtual void  SDigits2Digits();
-  virtual void  Hits2Digits();
-  virtual void  Digits2Reco();
-  virtual void  SetMerger(AliZDCMerger* merger);
-  virtual AliZDCMerger* Merger();
+  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
   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:
 
-  Int_t        fNoShower;      // Flag to switch off the shower        
-  AliZDCMerger *fMerger;       // ! pointer to merger
-  
-  Int_t        fNMergedhits;    // Number of Merged hits for background
-  TClonesArray *fMergedHits;    // TCA for "merged" hits  
-  TTree               *fTreeSD;        // TreeS for merging
-  TTree               *fTreeMD;        // TreeD for merging
-  
-  Int_t        fNRecPoints;    // Number of RecPoints
-  TClonesArray *fRecPoints;    // List of RecPoints
+  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
 
-  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