option to run in current directory

instead of using mktemp
reconstructInTemporaryDir=0 (runs directly on the target storage)
reconstructInTemporaryDir=1 (creates a tmp dir with mktemp)
reconstructInTemporaryDir=2 (creates a rundir in $PWD)

diff --git a/PWGPP/benchmark/benchmark.config b/PWGPP/benchmark/benchmark.config
index c6d4599..ddd7972 100644 (file)
--- a/PWGPP/benchmark/benchmark.config
+++ b/PWGPP/benchmark/benchmark.config
@@ -33,7 +33,9 @@ alirootEnv="/cvmfs/alice.cern.ch/bin/alienv setenv AliRoot/$ALIROOT_VERSION -c"
 #run QA with a known good version of the QA script
 #trustedQAtrainMacro='/hera/alice/mkrzewic/gsisvn/Calibration/QAtrain_duo.C'
 
-## if set to 1, reconstruct in /tmp, then copy results to final place
+## if set to 1, run in whatever mktemp -d aasfa provides,
+## if set to 2, run in the current dir (as provided by the batch system) or subdir of that
+## then copy results to final place
 #
 reconstructInTemporaryDir=0
 

diff --git a/PWGPP/benchmark/benchmark.sh b/PWGPP/benchmark/benchmark.sh
index c0f2eee..45c689b 100755 (executable)
--- a/PWGPP/benchmark/benchmark.sh
+++ b/PWGPP/benchmark/benchmark.sh
@@ -133,10 +133,9 @@ goCPass0()
     return 1  
   fi
   
-  #runpath=${PWD}/rundir_cpass0_${runNumber}_${jobindex}
   runpath=${outputDir}
-  #[[ ${reconstructInTemporaryDir} -eq 1 && -n ${TMPDIR} ]] && runpath=${TMPDIR}
   [[ ${reconstructInTemporaryDir} -eq 1 ]] && runpath=$(mktemp -d -t cpass0.XXXXXX)
+  [[ ${reconstructInTemporaryDir} -eq 2 ]] && runpath=${PWD}/rundir_cpass0_${runNumber}_${jobindex}
   mkdir -p ${runpath}
   if [[ ! -d ${runpath} ]]; then
     touch ${doneFileTmp} 
@@ -373,10 +372,9 @@ goCPass1()
     return 1
   fi
   
-  #runpath=${PWD}/rundir_cpass1_${runNumber}_${jobindex}
   runpath=${outputDir}
-  #[[ ${reconstructInTemporaryDir} -eq 1 && -n ${TMPDIR} ]] && runpath=${TMPDIR}
   [[ ${reconstructInTemporaryDir} -eq 1 ]] && runpath=$(mktemp -d -t cpass1.XXXXXX)
+  [[ ${reconstructInTemporaryDir} -eq 2 ]] && runpath=${PWD}/rundir_cpass1_${runNumber}_${jobindex}
 
   #MC
   if [[ "${infile}" =~ galice\.root ]]; then
@@ -641,10 +639,9 @@ goMergeCPass0()
 
   [[ -f ${alirootSource} && -z ${ALICE_ROOT} ]] && source ${alirootSource}
 
-  #runpath=${PWD}/rundir_cpass0_Merge_${runNumber}
   runpath=${outputDir}
-  #[[ ${reconstructInTemporaryDir} -eq 1 && -n ${TMPDIR} ]] && runpath=${TMPDIR}
   [[ ${reconstructInTemporaryDir} -eq 1 ]] && runpath=$(mktemp -d -t mergeCPass0.XXXXXX)
+  [[ ${reconstructInTemporaryDir} -eq 2 ]] && runpath=${PWD}/rundir_mergeCPass0_${runNumber}
 
   mkdir -p ${runpath}
   if [[ ! -d ${runpath} ]]; then
@@ -808,10 +805,9 @@ goMergeCPass1()
 
   [[ -f ${alirootSource} && -z ${ALICE_ROOT} ]] && source ${alirootSource}
 
-  #runpath=${PWD}/rundir_cpass1_Merge_${runNumber}
   runpath=${outputDir}
-  #[[ ${reconstructInTemporaryDir} -eq 1 && -n ${TMPDIR} ]] && runpath=${TMPDIR}
   [[ ${reconstructInTemporaryDir} -eq 1 ]] && runpath=$(mktemp -d -t mergeCPass1.XXXXXX)
+  [[ ${reconstructInTemporaryDir} -eq 2 ]] && runpath=${PWD}/rundir_mergeCPass1_${runNumber}
 
   mkdir -p ${runpath}
   if [[ ! -d ${runpath} ]]; then