Obsolete file deleted

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

diff --git a/ZDC/AliZDCDigitizer.h b/ZDC/AliZDCDigitizer.h
index ba786d0a25e4fdf6fffe2caf925db7104a9bb9e1..851fe5fa91fdbe146263aff91ab28a17ed0862a3 100644 (file)
--- a/ZDC/AliZDCDigitizer.h
+++ b/ZDC/AliZDCDigitizer.h
@@ -12,13 +12,13 @@
 #include "AliDigitizer.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
-#include "AliZDCCalibData.h"
+#include "AliZDCPedestals.h"
+#include "AliZDCCalib.h"
 
 class AliRunDigitizer;
 
 class AliZDC;
 class AliZDCHit;
-class AliZDCMergedHit;
 class AliZDCDigit;
 
 class AliZDCDigitizer: public AliDigitizer {
@@ -38,16 +38,20 @@ public:
     {return fPMGain[det][pmDet];}
   //  Conversion factor from charge to ADC channels
   //         F = 1.6E-19 / Resolution [Coulomb/ch]
-  void    SetADCRes(Int_t *adcRes)
+  void    SetADCRes(Int_t *adcRes) {for (Int_t i=0;i<2;i++) fADCRes[i] = adcRes[i];}
   //  Two conversion factor are needed for ADC CAEN V965 
-    {for (Int_t i=0;i<2;i++) fADCRes[i] = adcRes[i];}
   Float_t GetADCRes(Int_t i) const {return fADCRes[i];}
   
-  void   GetStorage(const char* uri) {fStorage = AliCDBManager::Instance()->GetStorage(uri);}
+  void   SetCalibrationOn() {fIsCalibration=1;}  
   AliCDBStorage   *SetStorage(const char* uri);
-  AliZDCCalibData *GetCalibData(int runNumber) const; 
+  AliZDCPedestals *GetPedData() const; 
+  AliZDCCalib     *GetCalibData() const; 
 
 private:
+
+  AliZDCDigitizer(const AliZDCDigitizer&);
+  AliZDCDigitizer& operator=(const AliZDCDigitizer&);
+
   void    Fragmentation(Float_t impPar, Int_t specN, Int_t specP,
                         Int_t &freeSpecN, Int_t &freeSpecP) const;
   void    SpectatorSignal(Int_t SpecType, Int_t numEvents, 
@@ -57,12 +61,14 @@ private:
                     Int_t Res) const;
   Int_t   Pedestal(Int_t Detector, Int_t Quadrant, Int_t Res) const;
 
-  Float_t fPMGain[3][5];       // PM gain
+  Float_t fPMGain[6][5];       // PM gain
   Float_t fADCRes[2];          // ADC conversion factors
   
-  AliCDBStorage *fStorage;     //! storage
-  AliZDCCalibData *fCalibData;         //! calibration data
+  Int_t   fIsCalibration;      // !=0 if simulation creates calibration data
+  
+  AliZDCPedestals *fPedData;   //! pedestal calibration data
+  AliZDCCalib     *fCalibData;         //! energy and equalization calibration data
        
-  ClassDef(AliZDCDigitizer, 3)     // digitizer for ZDC
+  ClassDef(AliZDCDigitizer, 7)     // digitizer for ZDC
 };    
 #endif