X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2Fgate_run_submit_cluster.sh;h=7f1568dcfd801ff1b5deeea8672c699090a9084c;hb=83eb68efc39ad8fcb5e4e684afafcfc86b829c96;hp=ebb0917d8efff9fc1c044f8394f1f51bdecaf837;hpb=8cb22788763fe7077d9efd70ae922f4691255f6e;p=clitk.git

diff --git a/cluster_tools/gate_run_submit_cluster.sh b/cluster_tools/gate_run_submit_cluster.sh
index ebb0917..7f1568d 100755
--- a/cluster_tools/gate_run_submit_cluster.sh
+++ b/cluster_tools/gate_run_submit_cluster.sh
@@ -96,6 +96,7 @@ test -z "${PARAM}" || echo "param = ${PARAM}" >> "${PARAMFILE}"
 # Copy macros files (for log)
 mkdir ${OUTPUTDIR}/mac
 cp ${MACROFILE} ${OUTPUTDIR}/mac
+cp mac/* ${OUTPUTDIR}/mac/
 files=`grep "control/execute" ${MACROFILE} | cut -d " " -f 2`
 for i in $files
 do
@@ -104,10 +105,17 @@ done
 
 while test $NJOBS -gt 0; do
 
+    if [ "$PARAM" = "\"\"" ]
+    then
+        JPARAM="-a [JOB_ID,${NJOBS}]"
+    else
+        JPARAM="${PARAM} [JOB_ID,${NJOBS}]"
+    fi
+
     if test "${QSUB}" = "noqsub"
     then
         echo "Launching Gate log in ${OUTPUTDIR}/gate_${NJOBS}.log"
-        PARAM=\"${PARAM}\" INDEX=${NJOBS} INDEXMAX=${NJOBSMAX} OUTPUTDIR=${OUTPUTDIR}  RELEASEDIR=${RELEASEDIR} MACROFILE=${MACROFILE} MACRODIR=${MACRODIR} PBS_JOBID="local_${NJOBS}" bash "${JOBFILE}" > ${OUTPUTDIR}/gate_${NJOBS}.log &
+        PARAM=\"${JPARAM}\" INDEX=${NJOBS} INDEXMAX=${NJOBSMAX} OUTPUTDIR=${OUTPUTDIR}  RELEASEDIR=${RELEASEDIR} MACROFILE=${MACROFILE} MACRODIR=${MACRODIR} PBS_JOBID="local_${NJOBS}" bash "${JOBFILE}" > ${OUTPUTDIR}/gate_${NJOBS}.log &
     elif test "$(dnsdomainname)" = "in2p3.fr"
     then
         PROJECTGROUP=creatis
@@ -115,7 +123,7 @@ while test $NJOBS -gt 0; do
              -e "${OUTPUTDIR}" \
              -l sps=1 \
              -N "gate.${RUNID}" \
-             -v "PARAM=\"${PARAM}\",INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
+             -v "PARAM=\"${JPARAM}\",INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
              "${JOBFILE}" || error "submission error"
     else
         qsub -N "gatejob.${RUNID}" -o "${OUTPUTDIR}" \