Control-M removed

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALDigitizer.cxx

diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx
index cff2b3b2dc4b655bcaed9e54403c902d1c806cea..5a6ab74be26c8d3a0723d77fb40b6b5c7e5a92b1 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.cxx
+++ b/EMCAL/AliEMCALDigitizer.cxx
@@ -86,20 +86,20 @@ ClassImp(AliEMCALDigitizer)
   // ctor
 
   fSDigitizer = 0 ;
-  fNinputs = 1 ;
-  fPinNoise = 0.00001 ;
-  fTowerDigitThreshold = 0.001 ;
-  fTimeResolution     = 0.5e-9 ;
-  fTimeSignalLength   = 1.0e-9 ;
-  fPreShowerDigitThreshold = fTowerDigitThreshold/25. ;
-  fADCchannelTower = 0.000160;      // width of one ADC channel in GeV
-  fADCpedestalTower = 0.005 ;      // pedestal of ADC
-  fNADCTower = (Int_t) TMath::Power(2,16) ;  // number of channels in Tower ADC
-
-  fADCchannelPreSho  = 0.00000170;          // width of one ADC channel in Pre Shower
-  fADCpedestalPreSho = 0.005 ;         // pedestal of ADC
-  fNADCPreSho = (Int_t) TMath::Power(2,12);      // number of channels in Pre Shower ADC
-  fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude
+  fNinputs = 0 ;
+  fPinNoise = 0.0 ;
+  fTowerDigitThreshold = 0.0 ;
+  fTimeResolution     = 0. ;
+  fTimeSignalLength   = 0. ;
+  fPreShowerDigitThreshold = 0. ;
+  fADCchannelTower = 0.0;      // width of one ADC channel in GeV
+  fADCpedestalTower = 0. ;      // pedestal of ADC
+  fNADCTower = 0;  // number of channels in Tower ADC
+
+  fADCchannelPreSho  = 0.0;          // width of one ADC channel in Pre Shower
+  fADCpedestalPreSho = 0.0 ;         // pedestal of ADC
+  fNADCPreSho = 0;      // number of channels in Pre Shower ADC
+  fTimeThreshold = 0.0; //Means 1 MeV in terms of SDigits amplitude
   fManager = 0 ;
 
 
@@ -118,11 +118,11 @@ Bool_t AliEMCALDigitizer::Init()
   fTimeSignalLength   = 1.0e-9 ;
   fPreShowerDigitThreshold = fTowerDigitThreshold/25. ;
   fInitialized = kFALSE ;
-  fADCchannelTower = 0.000160;       // width of one ADC channel in GeV
+  fADCchannelTower = 0.000220;       // width of one ADC channel in GeV
   fADCpedestalTower = 0.005 ;      // GeV
   fNADCTower = (Int_t) TMath::Power(2,16) ;  // number of channels in Tower ADC
 
-  fADCchannelPreSho = 0.00000170;          // width of one ADC channel in Pre Shower
+  fADCchannelPreSho = 0.0000300;          // width of one ADC channel in Pre Shower
   fADCpedestalPreSho = 0.005 ;         // 
   fNADCPreSho = (Int_t) TMath::Power(2,12);      // number of channels in Pre ShowerADC
 
@@ -364,7 +364,6 @@ void AliEMCALDigitizer::Digitize(const Int_t event) {
   
   //Set indexes in list of digits
   //Int_t i ;
- cout << "fNADCTower = " << fNADCTower << "   fNADCPreSho = " << fNADCPreSho << endl ; 
  for (i = 0 ; i < ndigits ; i++) { 
     AliEMCALDigit * digit = (AliEMCALDigit *) digits->At(i) ; 
     digit->SetIndexInList(i) ;