Fixing a compilation problem

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

diff --git a/ZDC/AliZDCDigitizer.h b/ZDC/AliZDCDigitizer.h
index 2a61c7c76ae1e50eb21b32d2d1cfce52569c3524..27d1a8f7610236641991e014a4030f0d991f3ec3 100644 (file)
--- a/ZDC/AliZDCDigitizer.h
+++ b/ZDC/AliZDCDigitizer.h
@@ -12,13 +12,14 @@
 #include "AliDigitizer.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
-#include "AliZDCCalibData.h"
+#include "AliZDCPedestals.h"
+#include "AliZDCEnCalib.h"
+#include "AliZDCTowerCalib.h"
 
 class AliRunDigitizer;
 
 class AliZDC;
 class AliZDCHit;
-class AliZDCMergedHit;
 class AliZDCDigit;
 
 class AliZDCDigitizer: public AliDigitizer {
@@ -38,15 +39,23 @@ 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];}
   
-  AliCDBStorage   *SetStorage(const char* uri);
-  AliZDCCalibData *GetCalibData() const; 
+  void   SetCalibrationOn() {fIsCalibration=1;}  
+  AliCDBStorage    *SetStorage(const char* uri);
+  AliZDCPedestals  *GetPedData() const; 
+  AliZDCEnCalib    *GetEnCalibData() const; 
+  AliZDCTowerCalib *GetTowCalibData() const; 
+  
+  void    SetSpectators2Track() {fSpectators2Track=kTRUE;}
 
 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, 
@@ -58,9 +67,16 @@ private:
 
   Float_t fPMGain[6][5];       // PM gain
   Float_t fADCRes[2];          // ADC conversion factors
+  Int_t   fIsCalibration;      // !=0 if simulation creates calibration data
+  Bool_t  fIsSignalInADCGate;   // true if signal in ADC gate
+  Float_t fFracLostSignal;      // fraction of lost signal
+  
+  AliZDCPedestals  *fPedData;     //! pedestal calibration data
+  AliZDCEnCalib    *fEnCalibData;  //! energy and equalization calibration data
+  AliZDCTowerCalib *fTowCalibData; //! energy and equalization calibration data
   
-  AliZDCCalibData *fCalibData;         //! calibration data
+  Bool_t  fSpectators2Track;    // should digitizer track spectators
        
-  ClassDef(AliZDCDigitizer, 3)     // digitizer for ZDC
+  ClassDef(AliZDCDigitizer, 10)     // digitizer for ZDC
 };    
 #endif