Merge branch 'master' into wipe

[clitk.git] / cluster_tools / gate_job_cluster.job

diff --git a/cluster_tools/gate_job_cluster.job b/cluster_tools/gate_job_cluster.job
index 52540b214578efae945ee5aea151ac1ea01de5e5..9401268acb080c8e348d88d288feabf78ab30930 100644 (file)
--- a/cluster_tools/gate_job_cluster.job
+++ b/cluster_tools/gate_job_cluster.job
@@ -11,10 +11,7 @@
 #PBS -r n
 #PBS -l walltime=100:00:00
 #PBS -j oe
-
-#env
-#pwd
-#exit 1
+#PBS -l mem=3Gb
 
 
 function error {
@@ -65,6 +62,7 @@ test -d "${MACRODIR}" && test -d "${MACRODIR}/mac" || error "invalid macro"
 
 echo "Copying inputs"
 LOCALMACRODIR=$(mktemp -d)
+trap "mv output ${OUTPUTDIR}/output.${PBS_JOBID%%.*} ; rm -r ${LOCALMACRODIR} ; exit 1" 1 2 3 15
 cd ${LOCALMACRODIR}
 cp -r -L "${MACRODIR}"/{data,mac} .
 mkdir output
@@ -76,7 +74,8 @@ echo "Lauching macro"
 date
 if test "$RELEASEDIR" = "NONE"
 then
-       Gate ${PARAM} ${MACROFILE} || error "gate failed"
+        echo Gate ${PARAM} ${MACROFILE}
+       eval Gate ${PARAM} ${MACROFILE} || error "gate failed"
 else
        LD_PRELOAD="${ROOTLIBS}${G4LIBS}${CLHEPLIBS}${GATELIBS}" \
        G4LEVELGAMMADATA="${RELEASEDIR}/PhotonEvaporation2.1" \