Fix needed to connect friends to trees and chains.

diff --git a/STEER/AliAODEvent.cxx b/STEER/AliAODEvent.cxx
index a1dceaca3d0fa4e221310e822607334d51af14a1..9cdb7915b2613dc14cefde44be2bc84b0cbbcc03 100644 (file)
--- 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 fce9c9721567dcbab323e70f856e61f5cc50ac09..66794838023b10c132434d1e7b5d2e4f51376d12 100644 (file)
--- 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;