make friend access work in online and offline

diff --git a/STEER/ESD/AliESDEvent.cxx b/STEER/ESD/AliESDEvent.cxx
index f1d8bd842032a787ca3184c063254aad5c8dcdd5..3103e7aa3dd08b11cc682dc3b9209695a8544b41 100644 (file)
--- a/STEER/ESD/AliESDEvent.cxx
+++ b/STEER/ESD/AliESDEvent.cxx
@@ -1467,7 +1467,7 @@ void AliESDEvent::GetESDfriend(AliESDfriend *ev) const
 
   }
 
-  AliESDfriend *fr = (AliESDfriend*)(const_cast<AliESDEvent*>(this)->FindListObject("AliESDfriend"));
+  AliESDfriend *fr = (AliESDfriend*)(const_cast<AliESDEvent*>(this)->FindFriend());
   if (fr) ev->SetVZEROfriend(fr->GetVZEROfriend());
 }
 
@@ -2429,3 +2429,9 @@ void AliESDEvent::ConnectTracks() {
   //
 }
 
+//______________________________________________________________________________
+AliESDfriend* AliESDEvent::FindFriend() const 
+{ 
+  return static_cast<AliESDfriend*>(FindListObject("AliESDfriend")); 
+}
+

diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h
index 0dea219b765771ee25b29ab6b683ec8b4c2b93db..793bea82bc2dfb16d353f0e5a2a3415b91c56195 100644 (file)
--- a/STEER/ESD/AliESDEvent.h
+++ b/STEER/ESD/AliESDEvent.h
@@ -274,7 +274,7 @@ public:
 
   void SetESDfriend(const AliESDfriend *f) const;
   void GetESDfriend(AliESDfriend *f) const;
-  AliESDfriend* FindFriend() const { return static_cast<AliESDfriend*>(FindListObject("AliESDfriend")); }
+  virtual AliESDfriend* FindFriend() const;
 
   void SetPrimaryVertexTPC(const AliESDVertex *vertex); 
   const AliESDVertex *GetPrimaryVertexTPC() const {return fTPCVertex;}

diff --git a/STEER/ESD/AliESDInputHandler.cxx b/STEER/ESD/AliESDInputHandler.cxx
index f97039940a261b2dac41114b367a2061a38f8d21..76ed08e5f216547a37ac4af50c6caffa6c3b93a5 100644 (file)
--- a/STEER/ESD/AliESDInputHandler.cxx
+++ b/STEER/ESD/AliESDInputHandler.cxx
@@ -188,7 +188,7 @@ void AliESDInputHandler::ConnectFriends()
 
     cTree->AddFriend("esdFriendTree", esdFriendTreeFName.Data());
     cTree->SetBranchStatus("ESDfriend.", 1);
-    fFriend = (AliESDfriend*)(fEvent->FindListObject("AliESDfriend"));
+    fFriend = fEvent->FindFriend();
     if (fFriend) cTree->SetBranchAddress("ESDfriend.", &fFriend);
   }
 }

diff --git a/STEER/ESD/AliESDInputHandler.h b/STEER/ESD/AliESDInputHandler.h
index 3b7706b15de11d8cf8dec5663832b6d8bc9352aa..8a603efe60d88d48b1fb1a4c584aa719421e5998 100644 (file)
--- a/STEER/ESD/AliESDInputHandler.h
+++ b/STEER/ESD/AliESDInputHandler.h
@@ -67,6 +67,9 @@ class AliESDInputHandler : public AliInputEventHandler {
     virtual void CreatePIDResponse(Bool_t isMC=kFALSE);
     AliESDpid           *GetESDpid()       const {return fESDpid;}
     void                 SetESDpid(AliESDpid* pid)     {Changed(); fESDpid = pid;}
+
+    //HLT
+    virtual AliVfriendEvent*   GetVFriendEvent() const {return fFriend;};
   
  private:
     AliESDInputHandler(const AliESDInputHandler& handler);