Fixed leak in reading ESD friends with AliESDInputHandler

diff --git a/STEER/ESD/AliESDInputHandler.cxx b/STEER/ESD/AliESDInputHandler.cxx
index 28ee6eb5eccddca6cd167fe0e7d70d15ebe3c272..f97039940a261b2dac41114b367a2061a38f8d21 100644 (file)
--- a/STEER/ESD/AliESDInputHandler.cxx
+++ b/STEER/ESD/AliESDInputHandler.cxx
@@ -172,20 +172,20 @@ void AliESDInputHandler::ConnectFriends()
   //
   // Handle the friends first
   //
-  if (!fTree->FindBranch("ESDfriend.")) {
+  TTree* cTree = fTree->GetTree();
+  if (!cTree) cTree = fTree;      
+  if (!cTree->FindBranch("ESDfriend.")) {
     // Try to add ESDfriend. branch as friend
-      TString esdFriendTreeFName;
-      esdFriendTreeFName = (fTree->GetCurrentFile())->GetName();    
-      TString basename = gSystem->BaseName(esdFriendTreeFName);
-      Int_t index = basename.Index("#")+1;
-      basename.Remove(index);
-      basename += fFriendFileName;
-      TString dirname = gSystem->DirName(esdFriendTreeFName);
-      dirname += "/";
-      esdFriendTreeFName = dirname + basename;
-
-    TTree* cTree = fTree->GetTree();
-    if (!cTree) cTree = fTree;      
+    TString esdFriendTreeFName;
+    esdFriendTreeFName = (fTree->GetCurrentFile())->GetName();    
+    TString basename = gSystem->BaseName(esdFriendTreeFName);
+    Int_t index = basename.Index("#")+1;
+    basename.Remove(index);
+    basename += fFriendFileName;
+    TString dirname = gSystem->DirName(esdFriendTreeFName);
+    dirname += "/";
+    esdFriendTreeFName = dirname + basename;
+
     cTree->AddFriend("esdFriendTree", esdFriendTreeFName.Data());
     cTree->SetBranchStatus("ESDfriend.", 1);
     fFriend = (AliESDfriend*)(fEvent->FindListObject("AliESDfriend"));
@@ -198,6 +198,7 @@ Bool_t  AliESDInputHandler::FinishEvent()
 {
     // Finish the event 
   if(fEvent)fEvent->Reset();
+  if (fFriend) fFriend->Reset();
   if (fMixingHandler) fMixingHandler->FinishEvent();
   return kTRUE;
 } 

diff --git a/STEER/ESD/AliESDfriend.cxx b/STEER/ESD/AliESDfriend.cxx
index 2f0477fe594909cb54dbb3f932d631da580c17d8..32bf39b1ab64c406b88381d8eb2a0459594ad96d 100644 (file)
--- a/STEER/ESD/AliESDfriend.cxx
+++ b/STEER/ESD/AliESDfriend.cxx
@@ -91,6 +91,21 @@ AliESDfriend::~AliESDfriend() {
 }
 
 
+void AliESDfriend::Reset()
+{
+  //
+  // Reset friend information
+  //
+  fTracks.Delete();
+  for (Int_t i=0;i<72;i++)
+  {
+    fNclustersTPC[i]=0;
+    fNclustersTPCused[i]=0;
+  }
+  delete fESDVZEROfriend; fESDVZEROfriend=0;
+  delete fESDTZEROfriend; fESDTZEROfriend=0;
+}  
+
 
 void AliESDfriend::SetVZEROfriend(AliESDVZEROfriend * obj)
 {

diff --git a/STEER/ESD/AliESDfriend.h b/STEER/ESD/AliESDfriend.h
index 2d3fdcb98dfb17d0d8b4d61d114cea0db0f4ef61..530389ee4c35b618c2b5f779a1e588803d7b6fe3 100644 (file)
--- a/STEER/ESD/AliESDfriend.h
+++ b/STEER/ESD/AliESDfriend.h
@@ -45,6 +45,7 @@ public:
          return fTracks.ls();
   }
 
+  void Reset();
   // bit manipulation for filtering
   void SetSkipBit(Bool_t skip){SetBit(23,skip);}
   Bool_t TestSkipBit() {return TestBit(23);}