Some additions for mixing.

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index 3a10dc511cbbe51ec597d3d08c13b90175d152c5..1fad163826370c63b6ad176e7e31f05c257c2074 100644 (file)
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -87,7 +87,7 @@ Bool_t AliESDInputHandler::Init(TTree* tree,  Option_t* opt)
     // Initialisation necessary for each new tree 
     // 
     fAnalysisType = opt;
-    if (tree) fTree = tree;
+    fTree = tree;
     
     if (!fTree) return kFALSE;
     fTree->GetEntry(0);
@@ -97,7 +97,7 @@ Bool_t AliESDInputHandler::Init(TTree* tree,  Option_t* opt)
     fEvent->ReadFromTree(fTree);
     fNEvents = fTree->GetEntries();
 
-    if (fMixingHandler) fMixingHandler->Init(0,  opt);
+    if (fMixingHandler) fMixingHandler->Init(tree,  opt);
 
     return kTRUE;
 }
@@ -131,7 +131,8 @@ Bool_t AliESDInputHandler::BeginEvent(Long64_t entry)
   // Friends
   ((AliESDEvent*)fEvent)->SetESDfriend(fFriend);
   called = kTRUE;
-  
+
+  if (fMixingHandler) fMixingHandler->BeginEvent(entry);  
       
   return kTRUE;
 }
@@ -149,7 +150,7 @@ Bool_t  AliESDInputHandler::FinishEvent()
 {
     // Finish the event 
   if(fEvent)fEvent->Reset();
-  
+  if (fMixingHandler) fMixingHandler->FinishEvent();
   return kTRUE;
 } 
 

diff --git a/STEER/AliInputEventHandler.h b/STEER/AliInputEventHandler.h
index da741c1a87ec5f50acec971333d976aee8bc8d14..891345dddff91ea862842edb5099e98409089d0b 100644 (file)
--- a/STEER/AliInputEventHandler.h
+++ b/STEER/AliInputEventHandler.h
@@ -33,6 +33,7 @@ class AliInputEventHandler : public AliVEventHandler {
     virtual Bool_t       Init(Option_t* /*opt*/)                      {return kTRUE;}
     virtual Bool_t       Init(TTree* /*tree*/, Option_t* /*opt*/)     {return kTRUE;}
     virtual Bool_t       BeginEvent(Long64_t /*entry*/)               {return kTRUE;}
+    virtual Bool_t       GetEntry()                                   {return kTRUE;}    
     virtual Bool_t       Notify() { return AliVEventHandler::Notify();}
     virtual Bool_t       Notify(const char */*path*/)                 {return kTRUE;}
     virtual Bool_t       FinishEvent()                                {return kTRUE;}