Changed scripts for new TrainSetup

diff --git a/PWGLF/FORWARD/analysis2/gridAnalysis.sh b/PWGLF/FORWARD/analysis2/gridAnalysis.sh
index 059ab2e1cf444bbe2517b51116759b6145ceff39..8c9181ea9ebf8acc2cd2da4f86dfdd8e4d8623fa 100755 (executable)
--- a/PWGLF/FORWARD/analysis2/gridAnalysis.sh
+++ b/PWGLF/FORWARD/analysis2/gridAnalysis.sh
@@ -411,12 +411,13 @@ allAboard()
        uopt="${uopt}&par"
     fi
     url="alien://${dir}?run=${runs}&pattern=${pat}${uopt}${aliroot}${root}#${tree}"
        uopt="${uopt}&par"
     fi
     url="alien://${dir}?run=${runs}&pattern=${pat}${uopt}${aliroot}${root}#${tree}"

+    opts="${opts} --include=$ALICE_ROOT/PWGLF/FORWARD/analysis2/trains"

     opts="${opts} --date=${now} --class=$cl --name=$nme"
     
     echo "Running train: runTrain2 ${opts} --url=${url} $@" 
     if test $noact -gt 0 ; then return ; fi
 
     opts="${opts} --date=${now} --class=$cl --name=$nme"
     
     echo "Running train: runTrain2 ${opts} --url=${url} $@" 
     if test $noact -gt 0 ; then return ; fi
 

-    runTrain2 ${opts} --overwrite --url=${url} $@ 
+    runTrain ${opts} --overwrite --url=${url} $@ 

 
     cat <<EOF
 Check https://alimonitor.cern.ch/users/jobs.jsp for progress 
 
     cat <<EOF
 Check https://alimonitor.cern.ch/users/jobs.jsp for progress 

diff --git a/PWGLF/FORWARD/trains/TrainSetup.C b/PWGLF/FORWARD/trains/TrainSetup.C
index dc1c3ed4543980a7d3abec24bdbaed6828156c26..bb91be1723626d9c8877049d0f85648d47a4a9b9 100644 (file)
--- a/PWGLF/FORWARD/trains/TrainSetup.C
+++ b/PWGLF/FORWARD/trains/TrainSetup.C
@@ -703,8 +703,8 @@ protected:
       << "  --name=$name";
     opts.Store(o, " \\\n  --", "", true);
     o << ")\n\n"
       << "  --name=$name";
     opts.Store(o, " \\\n  --", "", true);
     o << ")\n\n"

-      << "echo \"Running runTrain2 ${opts[@]} $@\"\n"
-      << "runTrain2 \"${opts[@]}\" $@\n\n"
+      << "echo \"Running runTrain ${opts[@]} $@\"\n"
+      << "runTrain \"${opts[@]}\" $@\n\n"

       << "# EOF" << std::endl;
     o.close();
     gSystem->Exec(Form("chmod a+x %s.sh", out.Data()));
       << "# EOF" << std::endl;
     o.close();
     gSystem->Exec(Form("chmod a+x %s.sh", out.Data()));