Updating

[u/mrichter/AliRoot.git] / PHOS / AliPHOSDigitizer.cxx

diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx
index 14ef6de02167b04af3e74eb50cd4c9d4214c4d27..3a9e9377e8c7c85c1a90f6a5747d3ecb2780c366 100644 (file)
--- a/PHOS/AliPHOSDigitizer.cxx
+++ b/PHOS/AliPHOSDigitizer.cxx
@@ -90,7 +90,7 @@ ClassImp(AliPHOSDigitizer)
 }
 
 //____________________________________________________________________________ 
-AliPHOSDigitizer::AliPHOSDigitizer(const TString alirunFileName, const TString eventFolderName):
+AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, TString eventFolderName):
   AliDigitizer("PHOS"+AliConfig::fgkDigitizerTaskName, alirunFileName),
   fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName)
 {
@@ -130,12 +130,11 @@ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd):
  AliDigitizer(rd,"PHOS"+AliConfig::fgkDigitizerTaskName),
  fEventFolderName(0)
 {
-  // ctor
+  // ctor Init() is called by RunDigitizer
   fManager = rd ; 
   fEventFolderName = fManager->GetInputFolderName(0) ;
   SetTitle(dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetFileName(0));
   InitParameters() ; 
-  Init() ; 
   fDefaultInit = kFALSE ; 
 }
 
@@ -151,7 +150,7 @@ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd):
 }
 
 //____________________________________________________________________________
-void AliPHOSDigitizer::Digitize(const Int_t event) 
+void AliPHOSDigitizer::Digitize(Int_t event) 
 { 
   
   // Makes the digitization of the collected summable digits.
@@ -162,6 +161,11 @@ void AliPHOSDigitizer::Digitize(const Int_t event)
   // contribution to new SDigits only.
 
   AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; 
+  Int_t ReadEvent = event ; 
+  if (fManager) 
+    ReadEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetCurrentEventNumber() ; 
+  Info("Digitize", "Adding event %d from input stream 0 %s %s", ReadEvent, GetTitle(), fEventFolderName.Data()) ; 
+  gime->Event(ReadEvent, "S") ;
   TClonesArray * digits = gime->Digits() ; 
   digits->Clear() ;
 
@@ -182,7 +186,7 @@ void AliPHOSDigitizer::Digitize(const Int_t event)
   AliPHOSSDigitizer * sDigitizer = gime->SDigitizer(); 
 
   if ( !sDigitizer )
-    Fatal("Digitize", "SDigitizer with name %s %s not found", fEventFolderName.Data(), GetTitle() ) ; 
+    Fatal("Digitize", "SDigitizer with name %s %s not found", GetTitle(), fEventFolderName.Data() ) ; 
 
   //take all the inputs to add together and load the SDigits
   TObjArray * sdigArray = new TObjArray(fInput) ;
@@ -191,8 +195,11 @@ void AliPHOSDigitizer::Digitize(const Int_t event)
   for(i = 1 ; i < fInput ; i++){
     TString tempo(fEventNames[i]) ; 
     tempo += i ;
-    AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ; 
-    gime->Event(event,"S");
+    AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ;
+    if (fManager) 
+      ReadEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(i))->GetCurrentEventNumber() ; 
+    Info("Digitize", "Adding event %d from input stream %d %s %s", ReadEvent, i, fInputFileNames[i].Data(), tempo.Data()) ; 
+    gime->Event(ReadEvent,"S");
     sdigArray->AddAt(gime->SDigits(), i) ;
   }
 
@@ -385,7 +392,8 @@ void AliPHOSDigitizer::Exec(Option_t *option)
   // Steering method to process digitization for events
   // in the range from fFirstEvent to fLastEvent.
   // This range is optionally set by SetEventRange().
-  // if fLastEvent=-1 (by default), then process events until the end.
+  // if fLastEvent=-1, then process events until the end.
+  // by default fLastEvent = fFirstEvent (process only one event)
 
   if (!fInit) { // to prevent overwrite existing file
     Error( "Exec", "Give a version name different from %s", fEventFolderName.Data() ) ;
@@ -400,15 +408,13 @@ void AliPHOSDigitizer::Exec(Option_t *option)
   if(strstr(option,"tim"))
     gBenchmark->Start("PHOSDigitizer");
   
-  if (fManager) 
-    fInput = fManager->GetNinputs() ;
-  
-  AliPHOSGetter * gime = AliPHOSGetter::Instance() ;
+  AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle()) ;
 
   if (fLastEvent == -1) 
     fLastEvent = gime->MaxEvent() - 1 ;
-  else 
-    fLastEvent = TMath::Min(fLastEvent,gime->MaxEvent());
+  else if (fManager) 
+    fLastEvent = fFirstEvent ; 
+ 
   Int_t nEvents   = fLastEvent - fFirstEvent + 1;
   
   Int_t ievent ;
@@ -484,6 +490,8 @@ Bool_t AliPHOSDigitizer::Init()
   // Post Digitizer to the white board
   gime->PostDigitizer(this) ;
   
+  fFirstEvent = 0 ; 
+  fLastEvent = fFirstEvent ; 
   if (fManager) 
     fInput = fManager->GetNinputs() ; 
   else 
@@ -497,7 +505,7 @@ Bool_t AliPHOSDigitizer::Init()
   for (index = 1 ; index < fInput ; index++) {
     fInputFileNames[index] = dynamic_cast<AliStream*>(fManager->GetInputStream(index))->GetFileName(0); 
     TString tempo = fManager->GetInputFolderName(index) ;
-    fEventNames[index] = tempo.Remove(tempo.Length()-1) ; // strip of the stream number added bt fManager 
+    fEventNames[index] = tempo.Remove(tempo.Length()-1) ; // strip of the stream number added by fManager
   }
 
   //to prevent cleaning of this object while GetEvent is called
@@ -509,7 +517,7 @@ Bool_t AliPHOSDigitizer::Init()
 //____________________________________________________________________________ 
 void AliPHOSDigitizer::InitParameters()
 {
-  // Set initial parameters for Digitizer
+  // Set initial parameters Digitizer
 
   fPinNoise           = 0.004 ;
   fEMCDigitThreshold  = 0.012 ;
@@ -532,7 +540,7 @@ void AliPHOSDigitizer::InitParameters()
 }
 
 //__________________________________________________________________
-void AliPHOSDigitizer::MixWith(const TString alirunFileName, const TString eventFolderName)
+void AliPHOSDigitizer::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