AliAODEvent: corrected copy constructor and assignment operator. This do not work...
[u/mrichter/AliRoot.git] / STEER / AliAODHandler.cxx
index 90f264d..002dd95 100644 (file)
@@ -1,3 +1,4 @@
+
 /**************************************************************************
  * Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
 #include <TTree.h>
 #include <TFile.h>
 #include <TString.h>
+#include <TList.h>
+#include <TROOT.h>
 
+#include "AliLog.h"
 #include "AliAODHandler.h"
 #include "AliAODEvent.h"
+#include "AliAODTracklets.h"
+#include "AliStack.h"
+#include "AliAODMCParticle.h"
+#include "AliAODMCHeader.h"
+#include "AliMCEventHandler.h"
+#include "AliMCEvent.h"
+#include "AliGenEventHeader.h"
+#include "AliGenHijingEventHeader.h"
+#include "AliGenDPMjetEventHeader.h"
+#include "AliGenPythiaEventHeader.h"
+#include "AliGenCocktailEventHeader.h"
+
+
 
 ClassImp(AliAODHandler)
 
@@ -34,6 +51,7 @@ ClassImp(AliAODHandler)
 AliAODHandler::AliAODHandler() :
     AliVEventHandler(),
     fIsStandard(kTRUE),
+    fFillAOD(kTRUE),
     fNeedsHeaderReplication(kFALSE),
     fNeedsTracksBranchReplication(kFALSE),
     fNeedsVerticesBranchReplication(kFALSE),
@@ -43,11 +61,15 @@ AliAODHandler::AliAODHandler() :
     fNeedsJetsBranchReplication(kFALSE),
     fNeedsFMDClustersBranchReplication(kFALSE),
     fNeedsCaloClustersBranchReplication(kFALSE),
+    fNeedsMCParticlesBranchReplication(kFALSE),
     fAODIsReplicated(kFALSE),
     fAODEvent(NULL),
+    fMCEventH(NULL),
     fTreeA(NULL),
     fFileA(NULL),
-    fFileName("")
+    fFileName(""),
+    fExtensions(NULL),
+    fFilters(NULL)
 {
   // default constructor
 }
@@ -56,6 +78,7 @@ AliAODHandler::AliAODHandler() :
 AliAODHandler::AliAODHandler(const char* name, const char* title):
     AliVEventHandler(name, title),
     fIsStandard(kTRUE),
+    fFillAOD(kTRUE),
     fNeedsHeaderReplication(kFALSE),
     fNeedsTracksBranchReplication(kFALSE),
     fNeedsVerticesBranchReplication(kFALSE),
@@ -65,25 +88,33 @@ AliAODHandler::AliAODHandler(const char* name, const char* title):
     fNeedsJetsBranchReplication(kFALSE),
     fNeedsFMDClustersBranchReplication(kFALSE),
     fNeedsCaloClustersBranchReplication(kFALSE),
+    fNeedsMCParticlesBranchReplication(kFALSE),
     fAODIsReplicated(kFALSE),
     fAODEvent(NULL),
+    fMCEventH(NULL),
     fTreeA(NULL),
     fFileA(NULL),
-    fFileName("")
+    fFileName(""),
+    fExtensions(NULL),
+    fFilters(NULL)
 {
+// Normal constructor.
 }
 
 //______________________________________________________________________________
 AliAODHandler::~AliAODHandler() 
 {
-  delete fAODEvent;
+ // Destructor.
+  if (fAODEvent) delete fAODEvent;
   if(fFileA){
     // is already handled in TerminateIO
     fFileA->Close();
     delete fFileA;
+    fTreeA = 0;
   }
-  delete fTreeA;
- // destructor
+  if (fTreeA) delete fTreeA;
+  if (fExtensions) {fExtensions->Delete(); delete fExtensions;}
+  if (fFilters)    {fFilters->Delete();    delete fFilters;}
 }
 
 //______________________________________________________________________________
@@ -100,55 +131,317 @@ Bool_t AliAODHandler::Init(Option_t* opt)
   // File opening according to execution mode
   TString option(opt);
   option.ToLower();
+  TDirectory *owd = gDirectory;
   if (option.Contains("proof")) {
     // proof
-    if (option.Contains("special")) {
-       // File for tree already opened on slave -> merging via files
-       fFileA = gFile;
-       CreateTree(1);
-    } else {   
-       // Merging in memory
-       CreateTree(0);
-    }   
+    // Merging via files. Need to access analysis manager via interpreter.
+    gROOT->ProcessLine(Form("AliAnalysisDataContainer *c_common_out = AliAnalysisManager::GetAnalysisManager()->GetCommonOutputContainer();"));
+    gROOT->ProcessLine(Form("AliAnalysisManager::GetAnalysisManager()->OpenProofFile(c_common_out, \"RECREATE\");"));
+    fFileA = gFile;
   } else {
     // local and grid
-    TDirectory *owd = gDirectory;
     fFileA = new TFile(fFileName.Data(), "RECREATE");
-    CreateTree(1);
-    owd->cd();
   }
+  CreateTree(1);
+  owd->cd();
+  if (fExtensions) {
+     TIter next(fExtensions);
+     AliAODExtension *ext;
+     while ((ext=(AliAODExtension*)next())) ext->Init(option);
+  }   
+  if (fFilters) {
+     TIter nextf(fFilters);
+     AliAODExtension *filteredAOD;
+     while ((filteredAOD=(AliAODExtension*)nextf())) {
+        filteredAOD->SetEvent(fAODEvent);
+        filteredAOD->Init(option);
+     }   
+  }   
   return kTRUE;
 }
 
+//______________________________________________________________________________
+void AliAODHandler::StoreMCParticles(){
+
+  // 
+  // Remap the labels from ESD stack and store
+  // the AODMCParticles, makes only sense if we have
+  // the mcparticles branch
+  // has to be done here since we cannot know in advance 
+  // which particles are needed (e.g. by the tracks etc.)
+  //
+  // Particles have been selected by AliMCEventhanlder->SelectParticle()
+  // To use the MCEventhandler here we need to set it from the outside
+  // can vanish when Handler go to the ANALYSISalice library
+  //
+  // The Branch booking for mcParticles and mcHeader has to happen 
+  // in an external task for now since the AODHandler does not have access
+  // the AnalysisManager. For the same reason the pointer t o the MCEventH
+  // has to passed to the AOD Handler by this task 
+  // (doing this in the steering macro would not work on PROOF)
+
+  TClonesArray *mcarray = (TClonesArray*)fAODEvent->FindListObject(AliAODMCParticle::StdBranchName()); 
+  if(!mcarray)return;
+  mcarray->Delete();
+
+  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
+
+  if(!fMCEventH)return;
+  if(!fMCEventH->MCEvent())return;
+  AliStack *pStack = fMCEventH->MCEvent()->Stack();
+  if(!pStack)return;
+
+  fMCEventH->CreateLabelMap();
+
+  //
+  // Get the Event Header 
+  // 
+
+  AliHeader* header = fMCEventH->MCEvent()->Header();
+   // get the MC vertex
+  AliGenEventHeader* genHeader = 0;
+  if (header) genHeader = header->GenEventHeader();
+  if (genHeader) {
+      TArrayF vtxMC(3);
+      genHeader->PrimaryVertex(vtxMC);
+      mcHeader->SetVertex(vtxMC[0],vtxMC[1],vtxMC[2]);
+
+      // we search the MCEventHeaders first 
+      // Two cases, cocktail or not...
+      AliGenCocktailEventHeader* genCocktailHeader = dynamic_cast<AliGenCocktailEventHeader*>(genHeader);
+      if(genCocktailHeader){
+         // we have a coktail header
+         mcHeader->AddGeneratorName(genHeader->GetName());
+         // Loop from the back so that the first one sets the process type
+         TList* headerList = genCocktailHeader->GetHeaders();
+         for(int i = headerList->GetEntries()-1;i>=0;--i){
+             AliGenEventHeader *headerEntry = dynamic_cast<AliGenEventHeader*>(headerList->At(i));
+             SetMCHeaderInfo(mcHeader,headerEntry);
+         }
+      }
+      else{
+         // No Cocktail just take the first one
+         SetMCHeaderInfo(mcHeader,genHeader);
+      }
+  }
+  
+
+
+
+
+  // Store the AliAODParticlesMC
+  AliMCEvent* mcEvent = fMCEventH->MCEvent();
+  
+  Int_t np    = mcEvent->GetNumberOfTracks();
+  Int_t nprim = mcEvent->GetNumberOfPrimaries();
+
+
+  Int_t j = 0;
+  TClonesArray& l = *mcarray;
+
+  for(int i = 0; i < np; ++i){
+      if(fMCEventH->IsParticleSelected(i)){
+         Int_t flag = 0;
+         AliMCParticle* mcpart =  (AliMCParticle*) mcEvent->GetTrack(i);
+         if(i<nprim)flag |= AliAODMCParticle::kPrimary;
+         
+         if(mcEvent->IsPhysicalPrimary(i))flag |= AliAODMCParticle::kPhysicalPrim;
+         
+         if(fMCEventH->GetNewLabel(i)!=j){
+             AliError(Form("MISMATCH New label %d j: %d",fMCEventH->GetNewLabel(i),j));
+         }
+
+         AliAODMCParticle mcpart_tmp(mcpart,i,flag);
+         
+         // 
+         Int_t d0 =  mcpart_tmp.GetDaughter(0);
+         Int_t d1 =  mcpart_tmp.GetDaughter(1);
+         Int_t m =   mcpart_tmp.GetMother();
+         
+         // other than for the track labels, negative values mean
+         // no daughter/mother so preserve it
+         
+         if(d0<0 && d1<0){
+             // no first daughter -> no second daughter
+             // nothing to be done
+             // second condition not needed just for sanity check at the end
+             mcpart_tmp.SetDaughter(0,d0);
+             mcpart_tmp.SetDaughter(1,d1);
+         } else if(d1 < 0 && d0 >= 0) {
+             // Only one daughter
+             // second condition not needed just for sanity check at the end
+             if(fMCEventH->IsParticleSelected(d0)){
+                 mcpart_tmp.SetDaughter(0,fMCEventH->GetNewLabel(d0));
+             } else {
+                 mcpart_tmp.SetDaughter(0,-1);
+             }
+             mcpart_tmp.SetDaughter(1,d1);
+         }
+         else if (d0 > 0 && d1 > 0 ){
+             // we have two or more daughters loop on the stack to see if they are
+             // selected
+             Int_t d0_tmp = -1;
+             Int_t d1_tmp = -1;
+             for(int id = d0; id<=d1;++id){
+                 if(fMCEventH->IsParticleSelected(id)){
+                     if(d0_tmp==-1){
+                         // first time
+                         d0_tmp = fMCEventH->GetNewLabel(id);
+                         d1_tmp = d0_tmp; // this is to have the same schema as on the stack i.e. with one daugther d0 and d1 are the same 
+                     }
+                     else d1_tmp = fMCEventH->GetNewLabel(id);
+                 }
+             }
+             mcpart_tmp.SetDaughter(0,d0_tmp);
+             mcpart_tmp.SetDaughter(1,d1_tmp);
+         } else {
+             AliError(Form("Unxpected indices %d %d",d0,d1));
+         }
+         
+         if(m<0){
+             mcpart_tmp.SetMother(m);
+         } else {
+             if(fMCEventH->IsParticleSelected(m))mcpart_tmp.SetMother(fMCEventH->GetNewLabel(m));
+             else AliError(Form("PROBLEM Mother not selected %d \n", m));
+         }
+         
+         new (l[j++]) AliAODMCParticle(mcpart_tmp);
+         
+      }
+  }
+  AliInfo(Form("AliAODHandler::StoreMCParticles: Selected %d (Primaries %d / total %d) after validation \n",
+              j,nprim,np));
+  
+  // Set the labels in the AOD output...
+  // Remapping
+
+  // AODTracks
+  TClonesArray* tracks = fAODEvent->GetTracks();
+  if(tracks){
+    for(int it = 0; it < fAODEvent->GetNTracks();++it){
+      AliAODTrack *track = fAODEvent->GetTrack(it);
+      
+      Int_t sign = 1;
+      Int_t label = track->GetLabel();
+      if(label<0){ // preserve the sign for later usage
+       label *= -1;
+       sign  = -1;
+      }
+
+      if (label >= AliMCEvent::BgLabelOffset()) label =  mcEvent->BgLabelToIndex(label);
+      if(label > np || track->GetLabel() == 0){
+       AliWarning(Form("Wrong ESD track label %5d (%5d)",track->GetLabel(), label));
+      }
+      if(fMCEventH->GetNewLabel(label) == 0){
+       AliWarning(Form("New label not found for %5d (%5d)",track->GetLabel(), label));
+      }
+      track->SetLabel(sign*fMCEventH->GetNewLabel(label));
+    }
+  }
+  
+  // AOD calo cluster
+  TClonesArray *clusters = fAODEvent->GetCaloClusters();
+  if(clusters){
+    for (Int_t iClust = 0;iClust < fAODEvent->GetNCaloClusters(); ++iClust) {
+      AliAODCaloCluster * cluster = fAODEvent->GetCaloCluster(iClust);
+      UInt_t nLabel    = cluster->GetNLabel();
+      // Ugly but do not want to fragment memory by creating 
+      // new Int_t (nLabel)
+      Int_t* labels    = const_cast<Int_t*>(cluster->GetLabels());
+      if (labels){
+       for(UInt_t i = 0;i < nLabel;++i){
+         labels[i] = fMCEventH->GetNewLabel(cluster->GetLabel(i));
+       }
+      }
+      //      cluster->SetLabels(labels,nLabel);
+    }// iClust
+  }// clusters
+
+  // AOD tracklets
+  AliAODTracklets *tracklets = fAODEvent->GetTracklets();
+  if(tracklets){
+    for(int it = 0;it < tracklets->GetNumberOfTracklets();++it){
+      int label0 = tracklets->GetLabel(it,0);
+      int label1 = tracklets->GetLabel(it,1);
+      if(label0>=0)label0 = fMCEventH->GetNewLabel(label0);      
+      if(label1>=0)label1 = fMCEventH->GetNewLabel(label1);
+      tracklets->SetLabel(it,0,label0);
+      tracklets->SetLabel(it,1,label1);
+    }
+  }
+
+}
+
+//______________________________________________________________________________
 Bool_t AliAODHandler::FinishEvent()
 {
-    // Fill data structures
+  // Fill data structures
+  if(fFillAOD){
     fAODEvent->MakeEntriesReferencable();
+    // StoreMCParticles();
     FillTree();
-    if (fIsStandard) fAODEvent->ResetStd();
-    // Reset AOD replication flag
-    fAODIsReplicated = kFALSE;
-    
-    return kTRUE;
+    if (fExtensions) {
+      TIter next(fExtensions);
+      AliAODExtension *ext;
+      while ((ext=(AliAODExtension*)next())) ext->FinishEvent();
+    }
+    if (fFilters) {   
+      TIter nextf(fFilters);
+      AliAODExtension *ext;
+      while ((ext=(AliAODExtension*)nextf())) {
+//        ext->SetEvent(fAODEvent);
+        ext->FinishEvent();
+      }  
+    }       
+  }
+  if (fIsStandard) fAODEvent->ResetStd();
+  // Reset AOD replication flag
+  fAODIsReplicated = kFALSE;
+  return kTRUE;
 }
 
 //______________________________________________________________________________
 Bool_t AliAODHandler::Terminate()
 {
-    // Terminate 
-    AddAODtoTreeUserInfo();
-    return kTRUE;
+  // Terminate 
+  AddAODtoTreeUserInfo();
+  if (fExtensions) {
+    TIter next(fExtensions);
+    AliAODExtension *ext;
+    while ((ext=(AliAODExtension*)next())) ext->GetTree()->GetUserInfo()->Add(ext->GetAOD());
+  }  
+  return kTRUE;
 }
 
 //______________________________________________________________________________
 Bool_t AliAODHandler::TerminateIO()
 {
-    // Terminate IO
-    if (fFileA) {
-       fFileA->Close();
-       delete fFileA;
-    }
-    return kTRUE;
+  // Terminate IO
+  if (fFileA) {
+    fFileA->Close();
+    delete fFileA;
+    fFileA = 0;
+    // When closing the file, the tree is also deleted.
+    fTreeA = 0;
+  }
+  if (fExtensions) {
+    TIter next(fExtensions);
+    AliAODExtension *ext;
+    while ((ext=(AliAODExtension*)next())) ext->TerminateIO();
+  }  
+  if (fFilters) {
+    TIter nextf(fFilters);
+    AliAODExtension *ext;
+    while ((ext=(AliAODExtension*)nextf())) ext->TerminateIO();
+  }  
+  return kTRUE;
 }
 
 //______________________________________________________________________________
@@ -164,32 +457,102 @@ void AliAODHandler::CreateTree(Int_t flag)
 void AliAODHandler::FillTree()
 {
     // Fill the AOD Tree
-    fTreeA->Fill();
+  fTreeA->Fill();
 }
 
 //______________________________________________________________________________
 void AliAODHandler::AddAODtoTreeUserInfo()
 {
-    // Add aod event to tree user info
-    fTreeA->GetUserInfo()->Add(fAODEvent);
+  // Add aod event to tree user info
+  fTreeA->GetUserInfo()->Add(fAODEvent);
+  // Now the tree owns our fAODEvent...
+  fAODEvent = 0;
 }
 
 //______________________________________________________________________________
-void AliAODHandler::AddBranch(const char* cname, void* addobj)
+void AliAODHandler::AddBranch(const char* cname, void* addobj, const char* filename)
 {
-    // Add a new branch to the aod 
+    // Add a new branch to the aod. Added optional filename parameter if the
+    // branch should be written to a separate file.
+    if (strlen(filename)) {
+       AliAODExtension *ext = AddExtension(filename);
+       ext->AddBranch(cname, addobj);
+       return;
+    }
     TDirectory *owd = gDirectory;
     if (fFileA) {
-       fFileA->cd();
+      fFileA->cd();
     }
     char** apointer = (char**) addobj;
     TObject* obj = (TObject*) *apointer;
-    fTreeA->Branch(obj->GetName(), cname, addobj);
+
     fAODEvent->AddObject(obj);
+    const Int_t kSplitlevel = 99; // default value in TTree::Branch()
+    const Int_t kBufsize = 32000; // default value in TTree::Branch()
+
+    if (!fTreeA->FindBranch(obj->GetName())) {
+      // Do the same as if we book via 
+      // TTree::Branch(TCollection*)
+      
+      fTreeA->Bronch(obj->GetName(), cname, fAODEvent->GetList()->GetObjectRef(obj),
+                    kBufsize, kSplitlevel - 1);
+      //    fTreeA->Branch(obj->GetName(), cname, addobj);
+    }
     owd->cd();
 }
 
 //______________________________________________________________________________
+AliAODExtension *AliAODHandler::AddExtension(const char *filename, const char *title)
+{
+// Add an AOD extension with some branches in a different file.
+   TString fname(filename);
+   if (!fname.EndsWith(".root")) fname += ".root";
+   if (!fExtensions) {
+      fExtensions = new TObjArray();
+      fExtensions->SetOwner();
+   }   
+   AliAODExtension *ext = (AliAODExtension*)fExtensions->FindObject(fname);
+   if (!ext) {
+      ext = new AliAODExtension(fname, title);
+      fExtensions->Add(ext);
+   }   
+   return ext;
+}
+
+//______________________________________________________________________________
+AliAODExtension *AliAODHandler::GetExtension(const char *filename) const
+{
+// Getter for AOD extensions via file name.
+   if (!fExtensions) return NULL;
+   return (AliAODExtension*)fExtensions->FindObject(filename);
+}   
+
+//______________________________________________________________________________
+AliAODExtension *AliAODHandler::AddFilteredAOD(const char *filename, const char *filtername)
+{
+// Add an AOD extension that can write only AOD events that pass a user filter.
+   if (!fFilters) {
+      fFilters = new TObjArray();
+      fFilters->SetOwner();
+   } 
+   AliAODExtension *filter = (AliAODExtension*)fFilters->FindObject(filename);
+   if (!filter) {
+      filter = new AliAODExtension(filename, filtername, kTRUE);
+      fFilters->Add(filter);
+   }
+   return filter;
+}      
+
+//______________________________________________________________________________
+AliAODExtension *AliAODHandler::GetFilteredAOD(const char *filename) const
+{
+// Getter for AOD filters via file name.
+   if (!fFilters) return NULL;
+   return (AliAODExtension*)fFilters->FindObject(filename);
+}   
+   
+//______________________________________________________________________________
 void AliAODHandler::SetOutputFileName(const char* fname)
 {
 // Set file name.
@@ -202,3 +565,189 @@ const char *AliAODHandler::GetOutputFileName()
 // Get file name.
    return fFileName.Data();
 }
+
+//______________________________________________________________________________
+void  AliAODHandler::SetMCHeaderInfo(AliAODMCHeader *mcHeader,AliGenEventHeader *genHeader){
+
+
+  // Utility function to cover different cases for the AliGenEventHeader
+  // Needed since different ProcessType and ImpactParamter are not 
+  // in the base class...
+  // We don't encode process types for event cocktails yet
+  // could be done e.g. by adding offsets depnding on the generator
+
+  mcHeader->AddGeneratorName(genHeader->GetName());
+  if(!genHeader)return;
+  AliGenPythiaEventHeader *pythiaGenHeader = dynamic_cast<AliGenPythiaEventHeader*>(genHeader);
+    if (pythiaGenHeader) {
+      mcHeader->SetEventType(pythiaGenHeader->ProcessType());
+      mcHeader->SetPtHard(pythiaGenHeader->GetPtHard());
+      return;
+    }
+    
+    AliGenDPMjetEventHeader* dpmJetGenHeader = dynamic_cast<AliGenDPMjetEventHeader*>(genHeader);
+
+  if (dpmJetGenHeader){
+    mcHeader->SetEventType(dpmJetGenHeader->ProcessType());
+    return;
+  } 
+
+  AliGenHijingEventHeader* hijingGenHeader = dynamic_cast<AliGenHijingEventHeader*>(genHeader);
+  if(hijingGenHeader){
+    mcHeader->SetImpactParameter(hijingGenHeader->ImpactParameter());
+    return;
+  }
+  
+  AliWarning(Form("MC Eventheader not known: %s",genHeader->GetName()));
+
+}
+
+ClassImp(AliAODExtension)
+
+//-------------------------------------------------------------------------
+//     Support class for AOD extensions. This is created by the user analysis
+//     that requires a separate file for some AOD branches. The name of the 
+//     AliAODExtension object is the file name where the AOD branches will be
+//     stored.
+//-------------------------------------------------------------------------
+
+//______________________________________________________________________________
+AliAODExtension::AliAODExtension(const char* name, const char* title, Bool_t isfilter)
+                :TNamed(name,title), 
+                 fAODEvent(0), 
+                 fTreeE(0), 
+                 fFileE(0), 
+                 fNtotal(0), 
+                 fNpassed(0),
+                 fSelected(kFALSE)
+{
+// Constructor.
+  if (isfilter) {
+    TObject::SetBit(kFilteredAOD);
+    printf("####### Added AOD filter %s\n", name);
+  } else printf("####### Added AOD extension %s\n", name);
+}   
+
+//______________________________________________________________________________
+AliAODExtension::~AliAODExtension()
+{
+// Destructor.
+  if(fFileE){
+    // is already handled in TerminateIO
+    fFileE->Close();
+    delete fFileE;
+    fTreeE = 0;
+    fAODEvent = 0;
+  }
+  if (fTreeE) delete fTreeE;
+}
+
+//______________________________________________________________________________
+void AliAODExtension::AddBranch(const char* cname, void* addobj)
+{
+    // Add a new branch to the aod 
+    if (IsFilteredAOD()) {
+       Error("AddBranch", "Not allowed to add branched to filtered AOD's.");
+       return;
+    }   
+    if (!fAODEvent) {
+       char type[20];
+       gROOT->ProcessLine(Form("TString s_tmp; AliAnalysisManager::GetAnalysisManager()->GetAnalysisTypeString(s_tmp); sprintf((char*)0x%lx, \"%%s\", s_tmp.Data());", type));
+       Init(type);
+    }
+    TDirectory *owd = gDirectory;
+    if (fFileE) {
+      fFileE->cd();
+    }
+    char** apointer = (char**) addobj;
+    TObject* obj = (TObject*) *apointer;
+
+    fAODEvent->AddObject(obj);
+    const Int_t kSplitlevel = 99; // default value in TTree::Branch()
+    const Int_t kBufsize = 32000; // default value in TTree::Branch()
+
+    if (!fTreeE->FindBranch(obj->GetName())) {
+      // Do the same as if we book via 
+      // TTree::Branch(TCollection*)
+      
+      fTreeE->Bronch(obj->GetName(), cname, fAODEvent->GetList()->GetObjectRef(obj),
+                    kBufsize, kSplitlevel - 1);
+      //    fTreeA->Branch(obj->GetName(), cname, addobj);
+    }
+    owd->cd();
+}
+
+//______________________________________________________________________________
+Bool_t AliAODExtension::FinishEvent()
+{
+// Fill current event.
+  fNtotal++;
+  if (!IsFilteredAOD()) {
+    fAODEvent->MakeEntriesReferencable();
+    fTreeE->Fill();
+    return kTRUE;
+  }  
+  // Filtered AOD. Fill only if event is selected.
+  if (!fSelected) return kTRUE;
+  fNpassed++;
+  fTreeE->Fill();
+  fSelected = kFALSE; // so that next event will not be selected unless demanded
+  return kTRUE;
+}  
+
+//______________________________________________________________________________
+Bool_t AliAODExtension::Init(Option_t *option)
+{
+// Initialize IO.
+  if(!fAODEvent) fAODEvent = new AliAODEvent();
+  TDirectory *owd = gDirectory;
+  TString opt(option);
+  opt.ToLower();
+  if (opt.Contains("proof")) {
+    // proof
+    // Merging via files. Need to access analysis manager via interpreter.
+    gROOT->ProcessLine(Form("AliAnalysisManager::GetAnalysisManager()->OpenProofFile(\"%s\", \"RECREATE\");", fName.Data()));
+    fFileE = gFile;
+  } else {
+    fFileE = new TFile(GetName(), "RECREATE");
+  }  
+  fTreeE = new TTree("aodTree", "AliAOD tree");
+  fTreeE->Branch(fAODEvent->GetList());
+  owd->cd();
+  return kTRUE;
+}
+
+//______________________________________________________________________________
+void AliAODExtension::SetEvent(AliAODEvent *event)
+{
+// Connects to an external event
+   if (!IsFilteredAOD()) {
+      Error("SetEvent", "Not allowed to set external event for filtered AOD's");   
+      return;
+   }
+   // Use the copy constructor or assignment operator to synchronize with external event.
+//   AliAODEvent &other = *event;
+//   if (!fAODEvent)     fAODEvent = new AliAODEvent(other);
+//   else if (fSelected) *fAODEvent = other;
+   fAODEvent = event;
+}
+   
+//______________________________________________________________________________
+Bool_t AliAODExtension::TerminateIO()
+{
+  // Terminate IO
+  if (TObject::TestBit(kFilteredAOD))
+    printf("AOD Filter %s: events processed: %d   passed: %d\n", GetName(), fNtotal, fNpassed);
+  else
+    printf("AOD extension %s: events processed: %d\n", GetName(), fNtotal);
+  if (fFileE) {
+    fFileE->Write();
+    fFileE->Close();
+    delete fFileE;
+    fFileE = 0;
+    fTreeE = 0;
+    fAODEvent = 0;
+  }
+  return kTRUE;
+}