Introduced option for the first and last event to process

diff --git a/EMCAL/AliEMCALReconstructioner.cxx b/EMCAL/AliEMCALReconstructioner.cxx
index dd514a5fc3492aab41597cc088051f5534a4d703..2df6ba1887ac2c5f3003f95dd30c7c33b3f8093e 100644 (file)
--- a/EMCAL/AliEMCALReconstructioner.cxx
+++ b/EMCAL/AliEMCALReconstructioner.cxx
@@ -91,12 +91,10 @@ TTask("AliEMCALReconstructioner",evFoldName)
   AliEMCALGetter::Instance(evFoldName) ; 
 
   fRecPointBranch=branchName ; 
-  Info("ctor", "Creating Clusterizer") ;
   fClusterizer = new AliEMCALClusterizerv1(evFoldName, GetTitle());
   Add(fClusterizer);
   
   fRecPartBranch=branchName ; 
-  Info("ctor", "Creating PID") ;
   fPID         = new AliEMCALPIDv1(evFoldName, GetTitle());
   Add(fPID);
   
@@ -181,3 +179,13 @@ void AliEMCALReconstructioner::Print()const {
        fClusterizer->GetName(), fRecPointBranch.Data(), 
        fPID->GetName(), fRecPartBranch.Data() ) ; 
 }
+
+//____________________________________________________________________________
+void AliEMCALReconstructioner::SetEventRange(Int_t first, Int_t last)
+{
+  // Set the event range to process
+  fFirstEvent=first; 
+  fLastEvent=last; 
+  fClusterizer->SetEventRange(fFirstEvent, fLastEvent) ; 
+  fPID->SetEventRange(fFirstEvent, fLastEvent) ;
+}

diff --git a/EMCAL/AliEMCALReconstructioner.h b/EMCAL/AliEMCALReconstructioner.h
index af001507c6a26fa9f43deb305f8f4a4469a46efa..2aac9b22eaaedb821a72049892ab6e049e5c0a82 100644 (file)
--- a/EMCAL/AliEMCALReconstructioner.h
+++ b/EMCAL/AliEMCALReconstructioner.h
@@ -44,6 +44,7 @@ public:
 
   AliEMCALClusterizer       * GetClusterizer()const { return fClusterizer ; }
   AliEMCALPID               * GetPID()        const { return fPID;          }
+  void SetEventRange(Int_t first=0, Int_t last=-1) ; 
 
   void Print()const ;
 
@@ -64,9 +65,10 @@ private:
 
   AliEMCALClusterizer       * fClusterizer ; //! Pointer to AliEMCALClusterizer
   AliEMCALPID               * fPID ;         //! Pointer to AliEMCALPID
+  Bool_t  fIsInitialized ; // kTRUE if reconstructioner is initialized
+  Int_t   fFirstEvent;        // first event to process
+  Int_t   fLastEvent;         // last  event to process
 
-  Bool_t   fIsInitialized ; // kTRUE if reconstructioner is initialized
- 
   ClassDef(AliEMCALReconstructioner,1)  // Reconstruction algorithm class (Base Class)
 
 }; 

diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx
index d9826e2480860536765f002d52bb1e4537f35b80..e7ca45e5de644ad569dc1681ab039aeda4d408b6 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.cxx
+++ b/EMCAL/AliEMCALSDigitizer.cxx
@@ -67,6 +67,7 @@ ClassImp(AliEMCALSDigitizer)
   AliEMCALSDigitizer::AliEMCALSDigitizer():TTask("","") 
 {
   // ctor
+  fFirstEvent = fLastEvent  = 0 ;  
   InitParameters() ; 
   fDefaultInit = kTRUE ; 
 }
@@ -77,6 +78,7 @@ AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, const char *
   fEventFolderName(eventFolderName)
 {
   // ctor
+  fFirstEvent = fLastEvent  = 0 ; // runs one event by defaut  
   Init();
   InitParameters() ; 
   fDefaultInit = kFALSE ; 
@@ -87,6 +89,8 @@ AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, const char *
 AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) : TTask(sd) {
   //cpy ctor 
 
+  fFirstEvent    = sd.fFirstEvent ; 
+  fLastEvent     = sd.fLastEvent ;
   fA             = sd.fA ;
   fB             = sd.fB ;
   fECPrimThreshold  = sd.fECPrimThreshold ;
@@ -143,11 +147,10 @@ void AliEMCALSDigitizer::InitParameters()
   AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
   const AliEMCALGeometry * geom = gime->EMCALGeometry() ; 
   if (geom->GetSampling() == 0.) {
-    printf("InitParameters: Sampling factor not set !") ; 
-    abort() ;
+    Fatal("InitParameters", "Sampling factor not set !") ; 
   }
   else
-    printf("InitParameters: Sampling factor set to %f\n", geom->GetSampling()) ; 
+    Info("InitParameters", "Sampling factor set to %f", geom->GetSampling()) ; 
   
   // this threshold corresponds approximately to 100 MeV
   fECPrimThreshold     = 100E-3;
@@ -165,7 +168,7 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
   if(strstr(option,"tim"))
     gBenchmark->Start("EMCALSDigitizer");
 
-  AliEMCALGetter * gime = AliEMCALGetter::Instance() ;
+  AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle()) ;
  
   //switch off reloading of this task while getting event
   if (!fInit) { // to prevent overwrite existing file
@@ -173,11 +176,15 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
     return ;
     }
 
-  Int_t nevents = gime->MaxEvent() ; 
+  if (fLastEvent == -1) 
+    fLastEvent = gime->MaxEvent() - 1 ;
+  else 
+    fLastEvent = TMath::Min(fFirstEvent, gime->MaxEvent()); // only ine event at the time
+  Int_t nEvents   = fLastEvent - fFirstEvent + 1;
+
   Int_t ievent ;   
-  for(ievent = 0; ievent < nevents; ievent++){     
+  for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
     gime->Event(ievent,"H") ;  
-
     TTree * treeS = gime->TreeS(); 
     TClonesArray * hits = gime->Hits() ; 
     TClonesArray * sdigits = gime->SDigits() ;
@@ -276,7 +283,7 @@ void AliEMCALSDigitizer::Exec(Option_t *option)
   if(strstr(option,"tim")){
     gBenchmark->Stop("EMCALSDigitizer"); 
     printf("Exec: took %f seconds for SDigitizing %f seconds per event", 
-        gBenchmark->GetCpuTime("EMCALSDigitizer"), gBenchmark->GetCpuTime("EMCALSDigitizer") ) ; 
+        gBenchmark->GetCpuTime("EMCALSDigitizer"), gBenchmark->GetCpuTime("EMCALSDigitizer")/nEvents ) ; 
   }
 }
 

diff --git a/EMCAL/AliEMCALSDigitizer.h b/EMCAL/AliEMCALSDigitizer.h
index c45b71e30920773e9bed9040e1147a1449698ea4..6245983f16747153b6699b833ebceabcabb4bb0b 100644 (file)
--- a/EMCAL/AliEMCALSDigitizer.h
+++ b/EMCAL/AliEMCALSDigitizer.h
@@ -37,6 +37,7 @@ public:
   Int_t         GetSDigitsInRun() const {return fSDigitsInRun ;}  
   virtual void  Print() const ;
   void          SetEventFolderName(TString name) { fEventFolderName = name ; }
+  void          SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; }
 
   Bool_t operator == (const AliEMCALSDigitizer & sd) const ;
   const AliEMCALSDigitizer & operator = (const AliEMCALSDigitizer & /*sd*/) {return *this ;}
@@ -56,6 +57,8 @@ private:
   TString fEventFolderName;        // event folder name
   Bool_t  fInit ;                  //! tells if initialisation wennt OK, will revent exec if not
   Int_t   fSDigitsInRun ;          //! Total number of sdigits in one run
+  Int_t   fFirstEvent;             // first event to process
+  Int_t   fLastEvent;              // last  event to process
 
   ClassDef(AliEMCALSDigitizer,5)  // description