Removed hardcoded AliESDs.root in AliESDInputHandler(RP)::Notify()

diff --git a/STEER/ESD/AliESDInputHandler.cxx b/STEER/ESD/AliESDInputHandler.cxx
index 864dbb5bf8f91beb8bad31091a8e58052a517a97..90ec2ec694c0c0a224b8dd8a4e5808cd2d1c700e 100644 (file)
--- a/STEER/ESD/AliESDInputHandler.cxx
+++ b/STEER/ESD/AliESDInputHandler.cxx
@@ -166,14 +166,14 @@ void AliESDInputHandler::ConnectFriends()
   if (!fTree->FindBranch("ESDfriend.")) {
     // Try to add ESDfriend. branch as friend
       TString esdFriendTreeFName;
-      esdFriendTreeFName = (fTree->GetCurrentFile())->GetName();
-    
-
-    if(esdFriendTreeFName.Contains("AliESDs.root")) {
-      esdFriendTreeFName.ReplaceAll("AliESDs.root", fFriendFileName.Data());
-    } else if(esdFriendTreeFName.Contains("AliESDs_wSDD.root")) {
-      esdFriendTreeFName.ReplaceAll("AliESDs_wSDD.root", fFriendFileName.Data());
-    }
+      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;      

diff --git a/STEER/ESD/AliESDInputHandlerRP.cxx b/STEER/ESD/AliESDInputHandlerRP.cxx
index 8febf1f3db8379d0f82b63a1b445ca8a56d96271..4dfa1a7b60604c3abb81a82fb30a40167a0e8918 100644 (file)
--- a/STEER/ESD/AliESDInputHandlerRP.cxx
+++ b/STEER/ESD/AliESDInputHandlerRP.cxx
@@ -222,11 +222,15 @@ Bool_t AliESDInputHandlerRP::Notify(const char *path)
     if (fileName.IsNull()) return kFALSE;
     AliInfo(Form("Directory change %s \n", path));
 
+    TString esdname = gSystem->BaseName(fileName);
+    Int_t index = esdname.Index("#")+1;
+    if (index) esdname.Remove(0,index);
+
     if(fileName.Contains("#")){
     // If this is an archive it will contain a # 
       fIsArchive = kTRUE;
-    } else  if(fileName.Contains("AliESDs.root")){
-      fileName.ReplaceAll("AliESDs.root", "");
+    } else  if(fileName.Contains(esdname)){
+      fileName.ReplaceAll(esdname, "");
     }
 
     //
@@ -243,7 +247,8 @@ Bool_t AliESDInputHandlerRP::Notify(const char *path)
       TFile* file = TFile::Open(fPathName->Data());
       TArchiveFile* arch = file->GetArchive();
       members = arch->GetMembers();
-      fPathName->ReplaceAll("#AliESDs.root", "");
+      fPathName->ReplaceAll("#", "");
+      fPathName->ReplaceAll("esdname", "");
     } else {
        // Directory or alien archive
       if (fileName.BeginsWith("alien:")) {