Updates for mixing.

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index be2c39d21810e9608f9827416f4f63900343ce82..3a10dc511cbbe51ec597d3d08c13b90175d152c5 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;
-    fTree         = tree;
+    if (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(tree,  opt);
+    if (fMixingHandler) fMixingHandler->Init(0,  opt);
 
     return kTRUE;
 }
@@ -132,7 +132,6 @@ Bool_t AliESDInputHandler::BeginEvent(Long64_t entry)
   ((AliESDEvent*)fEvent)->SetESDfriend(fFriend);
   called = kTRUE;
   
-  if (fMixingHandler) fMixingHandler->BeginEvent(entry);
       
   return kTRUE;
 }
@@ -151,8 +150,6 @@ Bool_t  AliESDInputHandler::FinishEvent()
     // Finish the event 
   if(fEvent)fEvent->Reset();
   
-  if (fMixingHandler) fMixingHandler->FinishEvent();
-
   return kTRUE;
 }