X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliMultiAODInputHandler.cxx;h=654825e660c23d35ebdc5c9928d0338488493d7d;hb=818a9d5f1b5ff10bcc9891a81a59a685aa90db9a;hp=7eae0e528995156640718c8b62d1289113157dfc;hpb=4338f37373982fb645dd76866cf051eb40f8f58e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliMultiAODInputHandler.cxx b/STEER/AliMultiAODInputHandler.cxx
index 7eae0e52899..654825e660c 100644
--- a/STEER/AliMultiAODInputHandler.cxx
+++ b/STEER/AliMultiAODInputHandler.cxx
@@ -22,8 +22,8 @@
 //-------------------------------------------------------------------------
 
 #include "AliMultiAODInputHandler.h"
-//#include "AliEventPool.h"
 #include "AliAODEvent.h"
+#include "AliVEventPool.h"
 #include "AliLog.h"
 #include <TObjArray.h>
 #include <TTree.h>
@@ -31,12 +31,26 @@
 
 ClassImp(AliMultiAODInputHandler)
 
+AliMultiAODInputHandler::AliMultiAODInputHandler() :
+    AliInputEventHandler(),
+    fBufferSize(0),
+    fNBuffered(0),
+    fIndex(0),
+    fCurrentBin(0),
+    fTree(0),
+    fEventPool(0),
+    fEventBuffer(0)
+{
+  // Default constructor
+}
+
 //______________________________________________________________________________
 AliMultiAODInputHandler::AliMultiAODInputHandler(Int_t size) :
     AliInputEventHandler(),
     fBufferSize(size),
     fNBuffered(0),
     fIndex(0),
+    fCurrentBin(0),
     fTree(0),
     fEventPool(0),
     fEventBuffer(new AliAODEvent*[size])
@@ -52,6 +66,7 @@ AliMultiAODInputHandler::AliMultiAODInputHandler(const char* name, const char* t
     fBufferSize(size),
     fNBuffered(0),
     fIndex(0),
+    fCurrentBin(0),
     fTree(0),
     fEventPool(0),
     fEventBuffer(new AliAODEvent*[size])
@@ -74,28 +89,42 @@ Bool_t AliMultiAODInputHandler::Init(TTree* tree, Option_t* /*opt*/)
     if (!fTree) return kFALSE;
     // Get pointer to AOD event
     fEventBuffer[0]->ReadFromTree(fTree);
-    fIndex = 0;
+    fIndex     = 0;
     fNBuffered = 1;
     return kTRUE;
 }
 
+Bool_t AliMultiAODInputHandler::BeginEvent(Long64_t /*entry*/)
+{
+    // Actions before analysis of each event 
+    //
+    // Reset the number of events buffered for this bin to 0
+    if (fCurrentBin != (fEventPool->BinNumber())) {
+	fCurrentBin = fEventPool->BinNumber();
+	fNBuffered = 0;
+    }
+    return kTRUE;
+}
+
 Bool_t AliMultiAODInputHandler::FinishEvent()
 {
     // 
     // Connect the next event in the buffer to the tree
     fIndex++;
-    fNBuffered++;
-    if (fNBuffered > fBufferSize) fNBuffered = fBufferSize;
     
     fIndex %= fBufferSize;
     AliInfo(Form("Connecting buffer entry %5d", fIndex));
-    fEventBuffer[fIndex]->Clear();
+
     fEventBuffer[fIndex]->ReadFromTree(fTree, "reconnect");
+
+    fNBuffered++;
+    if (fNBuffered > fBufferSize) fNBuffered = fBufferSize;
+
     return (kTRUE);
 }
 
 
-AliAODEvent* AliMultiAODInputHandler::GetEvent(Int_t iev)
+AliAODEvent* AliMultiAODInputHandler::GetEvent(Int_t iev) const
 {
     // Get event number iev from buffer
     if ((iev < 0) || (iev >= fBufferSize))