Event offset for merging added.

diff --git a/STEER/AliAODInputHandler.cxx b/STEER/AliAODInputHandler.cxx
index ced28bdbab2641a1e49821e074c41b970cdffd7f..5b969abfbe7849d1d4edfc73f338235dd25abf33 100644 (file)
--- a/STEER/AliAODInputHandler.cxx
+++ b/STEER/AliAODInputHandler.cxx
@@ -41,7 +41,8 @@ AliAODInputHandler::AliAODInputHandler() :
     fMergeEvents(kFALSE),
     fFileToMerge(0),
     fTreeToMerge(0),
-    fAODEventToMerge(0)
+    fAODEventToMerge(0),
+    fMergeOffset(0)
 {
   // Default constructor
 }
@@ -55,7 +56,8 @@ AliAODInputHandler::AliAODInputHandler(const char* name, const char* title):
   fMergeEvents(kFALSE),
   fFileToMerge(0),
   fTreeToMerge(0),
-  fAODEventToMerge(0)
+  fAODEventToMerge(0),
+  fMergeOffset(0)
 {
     // Constructor
 }
@@ -125,7 +127,7 @@ Bool_t AliAODInputHandler::BeginEvent(Long64_t entry)
     //
     TClonesArray* mcParticles = (TClonesArray*) (fEvent->FindListObject("mcparticles"));
     if (mcParticles) fMCEvent->SetParticleArray(mcParticles);
-    if (fTreeToMerge) fTreeToMerge->GetEntry(entry);
+    if (fTreeToMerge) fTreeToMerge->GetEntry(entry + fMergeOffset);
     
     return kTRUE;
 }

diff --git a/STEER/AliAODInputHandler.h b/STEER/AliAODInputHandler.h
index 57d91f5b25e1eac256061d48f86773d578247d19..4d4c3a1a6bc58377908443ce27db337b7bb5fc62 100644 (file)
--- a/STEER/AliAODInputHandler.h
+++ b/STEER/AliAODInputHandler.h
@@ -34,6 +34,7 @@ class AliAODInputHandler : public AliInputEventHandler {
     void                 SetMergeEvents(Bool_t flag) {fMergeEvents = flag;}
     Bool_t               GetMergeEvents() const {return fMergeEvents;}
     AliAODEvent*         GetEventToMerge() {return fAODEventToMerge;}
+    void                 SetMergeOffset(Int_t ioff) {fMergeOffset = ioff;}
  private:
     AliAODInputHandler(const AliAODInputHandler& handler);             
     AliAODInputHandler& operator=(const AliAODInputHandler& handler);  
@@ -46,6 +47,7 @@ class AliAODInputHandler : public AliInputEventHandler {
     TFile          *fFileToMerge;     //! File for merging
     TTree          *fTreeToMerge;     //! Tree for merging
     AliAODEvent    *fAODEventToMerge; //! Event for merging
+    Int_t           fMergeOffset;     //! Event offset for merging
     ClassDef(AliAODInputHandler, 2);
 };