X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCDigitizer.h;h=f78b7bf4d73ea5b12a44dd702a32416017d78f97;hb=b4bfafe9aa47a7bd74a7601aef9554deb892f277;hp=877cf62a331a0528bfa62fbe4eadb0933ed6e98c;hpb=1f8abeef26adc6efad6fee5c65c15e989e7cb493;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCDigitizer.h b/ZDC/AliZDCDigitizer.h
index 877cf62a331..f78b7bf4d73 100644
--- a/ZDC/AliZDCDigitizer.h
+++ b/ZDC/AliZDCDigitizer.h
@@ -13,10 +13,9 @@
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
 #include "AliZDCPedestals.h"
-#include "AliZDCEnCalib.h"
-#include "AliZDCTowerCalib.h"
 
-class AliRunDigitizer;
+class TFile;
+class AliDigitizationInput;
 
 class AliZDC;
 class AliZDCHit;
@@ -26,11 +25,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)
@@ -46,35 +45,54 @@ public:
   void	  SetCalibrationOn() {fIsCalibration=1;}  
   AliCDBStorage    *SetStorage(const char* uri);
   AliZDCPedestals  *GetPedData() const; 
-  AliZDCEnCalib    *GetEnCalibData() const; 
-  AliZDCTowerCalib *GetTowCalibData() const; 
   
   void    SetSpectators2Track() {fSpectators2Track=kTRUE;}
+  void    SetBeamEnergy(Float_t beamEnergy) {fBeamEnergy = beamEnergy;}
+
+  // Added for p-A simulations
+  void    SetpAsystem() {fIspASystem=kTRUE;}
+
+  // Added for RELDIS
+  void    SetRELDISGenerator() {fIsRELDISgen=kTRUE;}
+
+  void    SpectatorSignal(Int_t SpecType, Int_t numEvents, Float_t pm[3][5]);
+
 
 private:
 
   AliZDCDigitizer(const AliZDCDigitizer&);
   AliZDCDigitizer& operator=(const AliZDCDigitizer&);
 
+  void    CalculatePMTGains();
+  void    ReadPMTGains();
+
   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, 
-                          Float_t pm[3][5]) const;
 
   Int_t   Phe2ADCch(Int_t Detector, Int_t Quadrant, Float_t Light, 
                     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
+  AliZDCPedestals  *fPedData; 	//! pedestal calibration data
   
   Bool_t  fSpectators2Track;    // should digitizer track spectators
+  Float_t fBeamEnergy;          // beam energy
+  TString fBeamType;		// beam type
+  
+  // Added for p-A simulations
+  Bool_t  fIspASystem;       	// true if collision system is p-A
+
+  // Added for RELDIS
+  Bool_t  fIsRELDISgen;  	// true if generator is RELDIS
+  
+  TFile  *fSpectatorData;	// pointer to stored spectator data files
        
-  ClassDef(AliZDCDigitizer, 11)     // digitizer for ZDC
+  ClassDef(AliZDCDigitizer, 15)     // digitizer for ZDC
 };    
 #endif