Pass event number as argument of AliVEventHandler::BeginEvent

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index f75df58170cae73364ac944b11618457c437b878..ccabe11842d5c5bb90be623e2c0f2dbfbce0eb9c 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -302,9 +302,9 @@ Bool_t AliAnalysisManager::Process(Long64_t entry)
    if (fDebug > 1) {
       cout << "->AliAnalysisManager::Process()" << endl;
    }
-   if (fInputEventHandler)   fInputEventHandler  ->BeginEvent();
-   if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent();
-   if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent();
+   if (fInputEventHandler)   fInputEventHandler  ->BeginEvent(entry);
+   if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent(entry);
+   if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(entry);
    
    GetEntry(entry);
    ExecAnalysis();
@@ -764,11 +764,13 @@ void AliAnalysisManager::ExecAnalysis(Option_t *option)
          return;
       }   
       cont->SetData(fTree); // This will notify all consumers
+      Long64_t entry = fTree->GetTree()->GetReadEntry();
+      
 //
 //    Call BeginEvent() for optional input/output and MC services 
-      if (fInputEventHandler)   fInputEventHandler  ->BeginEvent();
-      if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent();
-      if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent();
+      if (fInputEventHandler)   fInputEventHandler  ->BeginEvent(entry);
+      if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent(entry);
+      if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(entry);
 //
 //    Execute the tasks
       TIter next1(cont->GetConsumers());
@@ -790,9 +792,9 @@ void AliAnalysisManager::ExecAnalysis(Option_t *option)
    // The event loop is not controlled by TSelector   
 //
 //  Call BeginEvent() for optional input/output and MC services 
-   if (fInputEventHandler)   fInputEventHandler  ->BeginEvent();
-   if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent();
-   if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent();
+   if (fInputEventHandler)   fInputEventHandler  ->BeginEvent(-1);
+   if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent(-1);
+   if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(-1);
    TIter next2(fTopTasks);
    while ((task=(AliAnalysisTask*)next2())) {
       task->SetActive(kTRUE);

diff --git a/STEER/AliAODHandler.h b/STEER/AliAODHandler.h
index f43edc92cdc0b9d619baaf8092dfe2b960199906..a143e8d8f8f191abc561b3c4857002326b16fc55 100644 (file)
--- a/STEER/AliAODHandler.h
+++ b/STEER/AliAODHandler.h
@@ -27,7 +27,7 @@ class AliAODHandler : public AliVEventHandler {
     virtual void         SetOutputFileName(char* fname) {fName = fname;}
     virtual char*        GetOutputFileName() {return fName;}
     virtual Bool_t       InitIO(Option_t* option);
-    virtual Bool_t       BeginEvent(){ return kTRUE;}
+    virtual Bool_t       BeginEvent(Long64_t /*entry*/) {return kTRUE;}
     // needed to prevent warning of hidden virtual Bool_t TObject::Notify()
     virtual Bool_t       Notify() { return AliVEventHandler::Notify(); };
     virtual Bool_t       Notify(const char * /* path */) {return kTRUE;}

diff --git a/STEER/AliAODInputHandler.h b/STEER/AliAODInputHandler.h
index 220999269894bc9899f56088f885a9a334438cce..700068c7578f28d27aeb2c88ca4d62e99167a6e5 100644 (file)
--- a/STEER/AliAODInputHandler.h
+++ b/STEER/AliAODInputHandler.h
@@ -20,7 +20,6 @@ class AliAODInputHandler : public AliInputEventHandler {
     AliAODInputHandler(const char* name, const char* title);
     virtual ~AliAODInputHandler();
     virtual Bool_t       InitIO(Option_t* opt);
-    virtual Bool_t       BeginEvent() {return kTRUE;}
     AliAODEvent         *GetEvent() const {return fEvent;}    
  private:
     AliAODEvent    *fEvent;   //! Pointer to the event 

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index 18ad703fc47a517643c80cc9ee3ed79006fca577..02568805b94a4a0fc63de52d47bd12a010f502e7 100644 (file)
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -56,7 +56,7 @@ Bool_t AliESDInputHandler::InitIO(Option_t* opt)
     return kTRUE;
 }
 
-Bool_t AliESDInputHandler::BeginEvent()
+Bool_t AliESDInputHandler::BeginEvent(Long64_t /*entry*/)
 {
     // Copy from old to new format if necessary
     AliESD* old = ((AliESDEvent*) fEvent)->GetAliESDOld();

diff --git a/STEER/AliESDInputHandler.h b/STEER/AliESDInputHandler.h
index 9c9da7cd482adf4273c982e851c3fce9df1987c0..c6206b8ee3b3e8babb56eaaef15e852db5e03a89 100644 (file)
--- a/STEER/AliESDInputHandler.h
+++ b/STEER/AliESDInputHandler.h
@@ -20,7 +20,7 @@ class AliESDInputHandler : public AliInputEventHandler {
     AliESDInputHandler(const char* name, const char* title);
     virtual ~AliESDInputHandler();
     virtual Bool_t       InitIO(Option_t* opt);
-    virtual Bool_t       BeginEvent();
+    virtual Bool_t       BeginEvent(Long64_t entry);
     AliESDEvent         *GetEvent() const {return fEvent;}
     private:
     AliESDEvent    *fEvent;   //! Pointer to the event 

diff --git a/STEER/AliInputEventHandler.h b/STEER/AliInputEventHandler.h
index 604f2e61290b84217bd4f507d9f99be300fdd55a..e2f7f94b7190db78d9b9549070a9f4ef81385633 100644 (file)
--- a/STEER/AliInputEventHandler.h
+++ b/STEER/AliInputEventHandler.h
@@ -24,7 +24,7 @@ class AliInputEventHandler : public AliVEventHandler {
     virtual void         SetOutputFileName(char* /*fname*/) {;}
     virtual char        *GetOutputFileName()                {return 0;}
     virtual Bool_t       InitIO(Option_t* /*opt*/)          {return kTRUE;}
-    virtual Bool_t       BeginEvent()                       {return kTRUE;}
+    virtual Bool_t       BeginEvent(Long64_t /*entry*/)     {return kTRUE;}
     // needed to prevent warning of hidden virtual Bool_t TObject::Notify()
     virtual Bool_t       Notify() { return AliVEventHandler::Notify(); };
     virtual Bool_t       Notify(const char */*path*/)       {return kTRUE;}

diff --git a/STEER/AliMCEvent.cxx b/STEER/AliMCEvent.cxx
index d22440c421b969d6265385541782891c97b365fe..1ce528b27d6e5cf1bb7e2d7053cc35cf08f2f24a 100644 (file)
--- a/STEER/AliMCEvent.cxx
+++ b/STEER/AliMCEvent.cxx
@@ -97,8 +97,11 @@ void AliMCEvent::ConnectTreeK (TTree* tree)
     fStack->GetEvent();
     fNparticles = fStack->GetNtrack();
     fNprimaries = fStack->GetNprimary();
-    AliInfo(Form("AliMCEvent: Number of particles: %5d (all) %5d (primaries)\n", 
-                fNparticles, fNprimaries));
+    Int_t iev  = fHeader->GetEvent();
+    Int_t ievr = fHeader->GetEventNrInRun();
+    
+    AliInfo(Form("AliMCEvent# %5d %5d: Number of particles: %5d (all) %5d (primaries)\n", 
+                iev, ievr, fNparticles, fNprimaries));
  
     // This is a cache for the TParticles converted to MCParticles on user request
     if (fMCParticleMap) {

diff --git a/STEER/AliMCEventHandler.cxx b/STEER/AliMCEventHandler.cxx
index 6c6470ebb081b7b00bd0aeea9615902b2dbfde87..f555489353cc1d69d74c566cb4a3a2cadbde7779 100644 (file)
--- a/STEER/AliMCEventHandler.cxx
+++ b/STEER/AliMCEventHandler.cxx
@@ -195,15 +195,21 @@ Bool_t AliMCEventHandler::OpenFile(Int_t i)
     return ok;
 }
 
-Bool_t AliMCEventHandler::BeginEvent()
+Bool_t AliMCEventHandler::BeginEvent(Long64_t entry)
 { 
     // Read the next event
-    fEvent++;
-    if (fEvent >= fNEvent) {
-       AliWarning(Form("AliMCEventHandler: Event number out of range %5d\n", fEvent));
+    if (entry == -1) {
+       fEvent++;
+       entry = fEvent;
+    } else {
+       fEvent = entry;
+    }
+
+    if (entry >= fNEvent) {
+       AliWarning(Form("AliMCEventHandler: Event number out of range %5d\n", entry));
        return kFALSE;
     }
-    return GetEvent(fEvent);
+    return GetEvent(entry);
 }
 
 Int_t AliMCEventHandler::GetParticleAndTR(Int_t i, TParticle*& particle, TClonesArray*& trefs)

diff --git a/STEER/AliMCEventHandler.h b/STEER/AliMCEventHandler.h
index 0a4252b392a6ec08befe490163d3f9e9c6a64dd1..88972c9abf799bd8525608e394f7fd37bfa08857 100644 (file)
--- a/STEER/AliMCEventHandler.h
+++ b/STEER/AliMCEventHandler.h
@@ -40,7 +40,7 @@ public:
     virtual void         SetInputTree(TTree* /*tree*/) {;}
     virtual TString*     GetInputPath() {return fPathName;}
     virtual Bool_t       InitIO(Option_t* opt);
-    virtual Bool_t       BeginEvent();
+    virtual Bool_t       BeginEvent(Long64_t entry);
     // needed to prevent warning of hidden virtual Bool_t TObject::Notify()
     virtual Bool_t       Notify() { return AliVEventHandler::Notify(); };
     virtual Bool_t       Notify(const char* path);

diff --git a/STEER/AliVEventHandler.h b/STEER/AliVEventHandler.h
index d77a55b8e1afca5076ac46c609609b8836306f0f..99cf9a87ef6bd9576d31ca63f399ed380e0579bd 100644 (file)
--- a/STEER/AliVEventHandler.h
+++ b/STEER/AliVEventHandler.h
@@ -27,7 +27,7 @@ class AliVEventHandler : public TNamed {
     virtual void         SetInputTree(TTree* tree)       = 0;
     // Steering 
     virtual Bool_t       InitIO(Option_t* opt)           = 0;
-    virtual Bool_t       BeginEvent()                    = 0;
+    virtual Bool_t       BeginEvent(Long64_t entry)      = 0;
     // needed to prevent warning of hidden virtual Bool_t TObject::Notify()
     virtual Bool_t       Notify() { return TNamed::Notify(); };
     virtual Bool_t       Notify(const char *path)        = 0;