Interface with new trigger mapping (Christian)

[u/mrichter/AliRoot.git] / PWG0 / PWG0Helper.C

diff --git a/PWG0/PWG0Helper.C b/PWG0/PWG0Helper.C
index 5dd551917c7394515ec3812cf04d52fa50f226f2..02b0bdb1d401d49cd7f7a3333e58f7124f44a08f 100644 (file)
--- a/PWG0/PWG0Helper.C
+++ b/PWG0/PWG0Helper.C
@@ -115,7 +115,7 @@ const char* GetAliRootLocation(Int_t aliroot)
 {
   switch (aliroot)
   {
-    case 1: return "/afs/cern.ch/alice/caf/sw/ALICE/v4-04-Release/slc4_ia32_gcc34/aliroot"; break;
+    case 1: return "/afs/cern.ch/alice/caf/sw/ALICE/$ROOTVERSIONTAG/v4-04-Release/slc4_ia32_gcc34/aliroot"; break;
     default: return 0;
   }
 }
@@ -135,12 +135,12 @@ void ProofEnableAliRoot(Int_t aliroot)
   const char* location = GetAliRootLocation(aliroot);
        const char* target = "tgt_linux";
 
-  gProof->Exec(Form("gSystem->Setenv(\"ALICE_ROOT\", \"%s\")", location), kTRUE);
+  gProof->Exec(Form("TString str(gSystem->ExpandPathName(\"%s\")); gSystem->Setenv(\"ALICE_ROOT\", str);", location), kTRUE);
+
   gProof->AddIncludePath(Form("%s/include", location));
   gProof->AddDynamicPath(Form("%s/lib/%s", location, target));
 
   // load all libraries
-  gProof->Exec("gSystem->Load(\"libMinuit\")");
   gProof->Exec("gROOT->Macro(\"$ALICE_ROOT/macros/loadlibs.C\")");
 }