X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCDigitizer.h;h=851fe5fa91fdbe146263aff91ab28a17ed0862a3;hb=f7d36813e09f560e4d5bfd49acb80ab266fd97af;hp=2a61c7c76ae1e50eb21b32d2d1cfce52569c3524;hpb=4fda3ba1838d13733556ee9fe382096863a9cef4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCDigitizer.h b/ZDC/AliZDCDigitizer.h
index 2a61c7c76ae..851fe5fa91f 100644
--- 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,15 +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	  SetCalibrationOn() {fIsCalibration=1;}  
   AliCDBStorage   *SetStorage(const char* uri);
-  AliZDCCalibData *GetCalibData() 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, 
@@ -59,8 +64,11 @@ private:
   Float_t fPMGain[6][5];      	// PM gain
   Float_t fADCRes[2];	      	// ADC conversion factors
   
-  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