From ced57103cb22cfd931df5774b3706462d6065fd4 Mon Sep 17 00:00:00 2001 From: morsch Date: Mon, 7 Apr 2008 15:40:16 +0000 Subject: [PATCH] Fix needed to connect friends to trees and chains. --- STEER/AliAODEvent.cxx | 8 ++++---- STEER/AliAODInputHandler.cxx | 7 ++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx index a1dceaca3d0..9cdb7915b26 100644 --- a/STEER/AliAODEvent.cxx +++ b/STEER/AliAODEvent.cxx @@ -388,7 +388,7 @@ void AliAODEvent::ReadFromTree(TTree *tree) } // // Let's find out whether we have friends - TList* friendL = tree->GetListOfFriends(); + TList* friendL = tree->GetTree()->GetListOfFriends(); if (friendL) { TIter next(friendL); @@ -419,11 +419,11 @@ void AliAODEvent::ReadFromTree(TTree *tree) while((el=(TNamed*)next())){ TString bname(el->GetName()); // check if branch exists under this Name - TBranch *br = tree->GetBranch(bname.Data()); + printf("Trying to connect branch %s\n", bname.Data()); + TBranch *br = tree->GetTree()->GetBranch(bname.Data()); if(br){ tree->SetBranchAddress(bname.Data(),fAODObjects->GetObjectRef(el)); - } - else{ + } else { br = tree->GetBranch(Form("%s.",bname.Data())); if(br){ tree->SetBranchAddress(Form("%s.",bname.Data()),fAODObjects->GetObjectRef(el)); diff --git a/STEER/AliAODInputHandler.cxx b/STEER/AliAODInputHandler.cxx index fce9c972156..66794838023 100644 --- a/STEER/AliAODInputHandler.cxx +++ b/STEER/AliAODInputHandler.cxx @@ -61,8 +61,13 @@ Bool_t AliAODInputHandler::Init(TTree* tree, Option_t* /*opt*/) fTree = tree; TIter next(fFriends); TNamed* obj; + while(obj = (TNamed*)next()) { - fTree->AddFriend("aodTree", obj->GetName()); + if (fTree->GetTree()) { + (fTree->GetTree())->AddFriend("aodTree", obj->GetName()); + } else { + fTree->AddFriend("aodTree", obj->GetName()); + } } if (!fTree) return kFALSE; -- 2.43.0