Removing warnings (alpha)

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

diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx
index 653ee3ba8b630b3f5357a04976e484a4190bcea4..2c4e6ca72902cc71c95d4a531117c52b6479113d 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.cxx
+++ b/EMCAL/AliEMCALDigitizer.cxx
@@ -99,7 +99,7 @@ ClassImp(AliEMCALDigitizer)
 }
 
 //____________________________________________________________________________ 
-AliEMCALDigitizer::AliEMCALDigitizer(const TString alirunFileName, const TString eventFolderName):
+AliEMCALDigitizer::AliEMCALDigitizer(TString alirunFileName, TString eventFolderName):
   AliDigitizer("EMCAL"+AliConfig::fgkDigitizerTaskName, alirunFileName),
   fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName)
 {
@@ -139,8 +139,7 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd):
 {
   // ctor
   fManager = rd ; 
-  SetName(fManager->GetInputFolderName(0)) ;
-  // take title as name of stream 0
+  fEventFolderName = fManager->GetInputFolderName(0) ;
   SetTitle(dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetFileName(0));
   InitParameters() ; 
   Init() ; 
@@ -151,13 +150,15 @@ AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd):
   AliEMCALDigitizer::~AliEMCALDigitizer()
 {
   // dtor
+  AliEMCALGetter * gime =AliEMCALGetter::Instance(GetTitle(),fEventFolderName);
+  gime->EmcalLoader()->CleanDigitizer();
   delete [] fInputFileNames ; 
   delete [] fEventNames ; 
 
 }
 
 //____________________________________________________________________________
-void AliEMCALDigitizer::Digitize(const Int_t event) 
+void AliEMCALDigitizer::Digitize(Int_t event) 
 { 
 
   // Makes the digitization of the collected summable digits
@@ -173,7 +174,6 @@ void AliEMCALDigitizer::Digitize(const Int_t event)
 
   const AliEMCALGeometry *geom = gime->EMCALGeometry() ; 
 
-  //Making digits from noise first
   Int_t nEMC = 0 ;
   nEMC = geom->GetNPhi()*geom->GetNZ(); //max number of digits possible
   
@@ -330,7 +330,7 @@ Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy)
   Int_t channel = -999; 
   channel = static_cast<Int_t> (TMath::Ceil( (energy + fADCpedestalEC)/fADCchannelEC ))  ;
   if(channel > fNADCEC ) 
-    channel =  fNADCEC ;   
+    channel =  fNADCEC ; 
   return channel ;
 }
 
@@ -450,15 +450,15 @@ Bool_t AliEMCALDigitizer::Init()
 //____________________________________________________________________________ 
 void AliEMCALDigitizer::InitParameters()
 {
-  fMeanPhotonElectron = 1250 ; // electrons per GeV
-  fPinNoise           = 0.001 ; // noise equivalent GeV (random choice)
+  fMeanPhotonElectron = 18200 ; // electrons per GeV
+  fPinNoise           = 0.1 ; // noise equivalent GeV (random choice)
   if (fPinNoise == 0. ) 
     Warning("InitParameters", "No noise added\n") ; 
   fDigitThreshold     = fPinNoise * 3; //2 sigma
-  fTimeResolution     = 0.5e-9 ;
+  fTimeResolution     = 1.0e-9 ;
   fTimeSignalLength   = 1.0e-9 ;
 
-  fADCchannelEC    = 0.000220;                     // width of one ADC channel in GeV
+  fADCchannelEC    = 0.00050;                     // width of one ADC channel in GeV
   fADCpedestalEC   = 0.005 ;                       // GeV
   fNADCEC          = (Int_t) TMath::Power(2,16) ;  // number of channels in Tower ADC
 
@@ -467,7 +467,7 @@ void AliEMCALDigitizer::InitParameters()
 }
 
 //__________________________________________________________________
-void AliEMCALDigitizer::MixWith(const TString alirunFileName, const TString eventFolderName)
+void AliEMCALDigitizer::MixWith(TString alirunFileName, TString eventFolderName)
 {
   // Allows to produce digits by superimposing background and signal event.
   // It is assumed, that headers file with SIGNAL events is opened in