- Reset the MC header in FinishEvent

[u/mrichter/AliRoot.git] / STEER / AliAODHandler.cxx

diff --git a/STEER/AliAODHandler.cxx b/STEER/AliAODHandler.cxx
index 25d4584016e43263dc0d2a9eb10f2c1d205e2d39..20d87fbd89c7b7c4769a2fc7c81bf3b16b74f7b7 100644 (file)
--- a/STEER/AliAODHandler.cxx
+++ b/STEER/AliAODHandler.cxx
@@ -197,8 +197,6 @@ void AliAODHandler::StoreMCParticles(){
   AliAODMCHeader *mcHeader = (AliAODMCHeader*)fAODEvent->FindListObject(AliAODMCHeader::StdBranchName()); 
   if(!mcHeader)return;
 
-  mcHeader->Reset();
-
   // Get the MC Infos.. Handler needs to be set before 
   // while adding the branch
   // This needs to be done, not to depend on the AnalysisManager
@@ -399,7 +397,8 @@ Bool_t AliAODHandler::FinishEvent()
       fTreeA->BranchRef();
       FillTree();
   }
-  if (fFillAODRun) {      
+
+  if (fFillAOD) {      
       if (fExtensions) {
          TIter next(fExtensions);
          AliAODExtension *ext;
@@ -417,6 +416,9 @@ Bool_t AliAODHandler::FinishEvent()
   TClonesArray *mcarray = (TClonesArray*)fAODEvent->FindListObject(AliAODMCParticle::StdBranchName()); 
   if(mcarray) mcarray->Delete();
 
+  AliAODMCHeader *mcHeader = (AliAODMCHeader*)fAODEvent->FindListObject(AliAODMCHeader::StdBranchName()); 
+  if(!mcHeader) mcHeader->Reset();
+
   // Reset AOD replication flag
   fAODIsReplicated = kFALSE;
   return kTRUE;