Fix for report #64208 Missing OCDB (GRP/Calib/MeanVertex) object in GRP

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

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index d2c1d78980dca3450c5fb7e6c27c4bb2528b3fcd..c2494fd92ad5f40bd26ebb4d178ea183b308e69f 100644 (file)
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -33,6 +33,8 @@
 
 #include "AliESDInputHandler.h"
 #include "AliESDEvent.h"
+#include "AliESDfriend.h"
+#include "AliVCuts.h"
 #include "AliESD.h"
 #include "AliRunTag.h"
 #include "AliEventTag.h"
@@ -46,6 +48,8 @@ static Option_t *gESDDataType = "ESD";
 AliESDInputHandler::AliESDInputHandler() :
   AliInputEventHandler(),
   fEvent(0x0),
+  fFriend(0x0),
+  fESDpid(0x0),
   fAnalysisType(0),
   fNEvents(0),
   fHLTEvent(0x0),
@@ -55,7 +59,9 @@ AliESDInputHandler::AliESDInputHandler() :
   fUseTags(kFALSE),
   fChainT(0),
   fTreeT(0),
-  fRunTag(0)
+  fRunTag(0),
+  fReadFriends(1),
+  fFriendFileName("AliESDfriends.root")
 {
   // default constructor
 }
@@ -69,8 +75,8 @@ AliESDInputHandler::~AliESDInputHandler()
 
 //______________________________________________________________________________
 AliESDInputHandler::AliESDInputHandler(const char* name, const char* title):
-    AliInputEventHandler(name, title), fEvent(0x0), fAnalysisType(0),
-    fNEvents(0),  fHLTEvent(0x0), fHLTTree(0x0), fUseHLT(kFALSE), fTagCutSumm(0x0), fUseTags(kFALSE), fChainT(0), fTreeT(0), fRunTag(0)
+    AliInputEventHandler(name, title), fEvent(0x0), fFriend(0x0), fESDpid(0x0), fAnalysisType(0),
+    fNEvents(0),  fHLTEvent(0x0), fHLTTree(0x0), fUseHLT(kFALSE), fTagCutSumm(0x0), fUseTags(kFALSE), fChainT(0), fTreeT(0), fRunTag(0), fReadFriends(1), fFriendFileName("AliESDfriends.root")
 {
     // Constructor
 }
@@ -88,16 +94,27 @@ Bool_t AliESDInputHandler::Init(TTree* tree,  Option_t* opt)
     SwitchOffBranches();
     SwitchOnBranches();
     
+    if (!fTree->FindBranch("ESDfriend.") && fReadFriends) {
+      // Try to add ESDfriend. branch as friend
+      TString esdTreeFName, esdFriendTreeFName;    
+      TTree* theTree = fTree->GetTree();
+      if (!theTree) theTree = tree;
+      esdTreeFName = (theTree->GetCurrentFile())->GetName();
+      esdFriendTreeFName = esdTreeFName;
+      esdFriendTreeFName.ReplaceAll("AliESDs.root", fFriendFileName.Data());
+      theTree->AddFriend("esdFriendTree", esdFriendTreeFName.Data());
+    }
+
     if (!fEvent) fEvent = new AliESDEvent();
     fEvent->ReadFromTree(fTree);
     fNEvents = fTree->GetEntries();
-
-
+    fFriend = (AliESDfriend*)(fEvent->FindListObject("AliESDfriend"));
     return kTRUE;
 }
 
 Bool_t AliESDInputHandler::BeginEvent(Long64_t entry)
 {
+    
     // Copy from old to new format if necessary
   AliESD* old = ((AliESDEvent*) fEvent)->GetAliESDOld();
   if (old) {
@@ -109,6 +126,16 @@ Bool_t AliESDInputHandler::BeginEvent(Long64_t entry)
       fHLTTree->GetEntry(entry);
   }
   
+  fNewEvent = kTRUE;
+  //
+  // Event selection
+  // 
+  if (fEventCuts)
+    fIsSelected = fEventCuts->IsSelected((AliESDEvent*)fEvent); 
+  //
+  // Friends
+  ((AliESDEvent*)fEvent)->SetESDfriend(fFriend);
+  
   return kTRUE;
 }