X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCDigitizer.h;h=42bb9a8491165a4718addbb68e11884f60e432bc;hb=8d25d294d70944726a09d1fc97e1181836ce6d57;hp=053c4f17452934ff2dfab7e299cc38369b9980d9;hpb=fd9afd6044aeaf4253616f9242f25f5d9aeacad4;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCDigitizer.h b/ZDC/AliZDCDigitizer.h
index 053c4f17452..42bb9a84911 100644
--- a/ZDC/AliZDCDigitizer.h
+++ b/ZDC/AliZDCDigitizer.h
@@ -13,9 +13,8 @@
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
 #include "AliZDCPedestals.h"
-#include "AliZDCCalib.h"
 
-class AliRunDigitizer;
+class AliDigitizationInput;
 
 class AliZDC;
 class AliZDCHit;
@@ -25,11 +24,11 @@ class AliZDCDigitizer: public AliDigitizer {
 
 public:
   AliZDCDigitizer();
-  AliZDCDigitizer(AliRunDigitizer* manager);
+  AliZDCDigitizer(AliDigitizationInput* digInput);
   virtual ~AliZDCDigitizer();
    
   virtual Bool_t Init();
-  virtual void Exec(Option_t* option=0);    
+  virtual void Digitize(Option_t* option=0);    
 
   //  PM gain
   void    SetPMGain(Int_t det, Int_t pmDet, Int_t pmGain)
@@ -43,9 +42,13 @@ public:
   Float_t GetADCRes(Int_t i) const {return fADCRes[i];}
   
   void	  SetCalibrationOn() {fIsCalibration=1;}  
-  AliCDBStorage   *SetStorage(const char* uri);
-  AliZDCPedestals *GetPedData() const; 
-  AliZDCCalib     *GetCalibData() const; 
+  AliCDBStorage    *SetStorage(const char* uri);
+  AliZDCPedestals  *GetPedData() const; 
+  
+  void    SetSpectators2Track() {fSpectators2Track=kTRUE;}
+
+  // Added for p-A simulations
+  void    SetpAsystem() {fIspASystem=kTRUE;}
 
 private:
 
@@ -61,15 +64,20 @@ private:
                     Int_t Res) const;
   Int_t   Pedestal(Int_t Detector, Int_t Quadrant, Int_t Res) const;
 
-  Float_t fPMGain[6][5];      	// PM gain
+  Float_t fPMGain[5][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
-  AliZDCCalib     *fCalibData; 	//! energy and equalization calibration data
+  AliZDCPedestals  *fPedData; 	   //! pedestal calibration data
+  
+  Bool_t  fSpectators2Track;    // should digitizer track spectators
+  Float_t fBeamEnergy;          // beam energy taken from GRP object
+  
+  // Added for p-A simulations
+  Bool_t  fIspASystem;       	// true if collision system is p-A
        
-  ClassDef(AliZDCDigitizer, 8)     // digitizer for ZDC
+  ClassDef(AliZDCDigitizer, 13)     // digitizer for ZDC
 };    
 #endif