Taking out some unused data members

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index 6145813a9f9ee974315c373232797f62fa427965..e81dda45215c788180f634174ae35f9b0be9545d 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -59,8 +59,6 @@ AliZDCDigitizer::AliZDCDigitizer() :
   fIsSignalInADCGate(kFALSE),
   fFracLostSignal(0.),
   fPedData(0), 
-  fEnCalibData(0),
-  fTowCalibData(0),
   fSpectators2Track(kFALSE)
 {
   // Default constructor    
@@ -74,8 +72,6 @@ AliZDCDigitizer::AliZDCDigitizer(AliRunDigitizer* manager):
   fIsSignalInADCGate(kFALSE),
   fFracLostSignal(0.),
   fPedData(GetPedData()), 
-  fEnCalibData(GetEnCalibData()),
-  fTowCalibData(GetTowCalibData()),
   fSpectators2Track(kFALSE)
 {
   // Get calibration data
@@ -101,8 +97,6 @@ AliZDCDigitizer::AliZDCDigitizer(const AliZDCDigitizer &digitizer):
   fIsSignalInADCGate(digitizer.fIsSignalInADCGate),
   fFracLostSignal(digitizer.fFracLostSignal),
   fPedData(digitizer.fPedData),
-  fEnCalibData(digitizer.fEnCalibData),
-  fTowCalibData(digitizer.fTowCalibData),
   fSpectators2Track(digitizer.fSpectators2Track)
 {
   // Copy constructor
@@ -165,7 +159,7 @@ Bool_t AliZDCDigitizer::Init()
        beamEnergy, beamEnergy, fPMGain[0][0], fPMGain[1][0], fPMGain[2][0]));
     }
   }
-  else if((beamType.CompareTo("A-A")) == 0){
+  else{
     // PTM gains for Pb-Pb @ 2.7_2.7 A TeV ***************
     for(Int_t j = 0; j < 5; j++){
       fPMGain[0][j] = 50000.;
@@ -175,6 +169,8 @@ Bool_t AliZDCDigitizer::Init()
       fPMGain[4][j] = 100000.;
       fPMGain[5][j] = 100000.;
     }
+    AliInfo(Form("    PMT gains for Pb-Pb @ %1.0f+%1.0f: ZN(%1.0f), ZP(%1.0f), ZEM(%1.0f)\n",
+       beamEnergy, beamEnergy, fPMGain[0][0], fPMGain[1][0], fPMGain[2][0]));
   }
     
   // ADC Caen V965
@@ -190,9 +186,6 @@ void AliZDCDigitizer::Exec(Option_t* /*option*/)
   // Execute digitization
 
   // ------------------------------------------------------------
-  // !!! 2nd ZDC set added 
-  // *** 1st 3 arrays are digits from REAL (simulated) hits
-  // *** last 2 are copied from simulated digits
   // --- pm[0][...] = light in ZN side C  [C, Q1, Q2, Q3, Q4]
   // --- pm[1][...] = light in ZP side C [C, Q1, Q2, Q3, Q4]
   // --- pm[2][...] = light in ZEM [x, 1, 2, x, x]

diff --git a/ZDC/AliZDCDigitizer.h b/ZDC/AliZDCDigitizer.h
index 27d1a8f7610236641991e014a4030f0d991f3ec3..877cf62a331a0528bfa62fbe4eadb0933ed6e98c 100644 (file)
--- a/ZDC/AliZDCDigitizer.h
+++ b/ZDC/AliZDCDigitizer.h
@@ -72,11 +72,9 @@ private:
   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
   
   Bool_t  fSpectators2Track;    // should digitizer track spectators
        
-  ClassDef(AliZDCDigitizer, 10)     // digitizer for ZDC
+  ClassDef(AliZDCDigitizer, 11)     // digitizer for ZDC
 };    
 #endif