diff --git a/bedpostx b/bedpostx index bd060f685324b5c58679d871da960d30ed641faa..bd9fa42fb542ade659d875c498fc0befe904b2fb 100755 --- a/bedpostx +++ b/bedpostx @@ -104,7 +104,7 @@ mkdir -p ${subjdir}.bedpostX/xfms mailto=`whoami`@fmrib.ox.ac.uk echo Queuing preprocessing stages -preprocid=`${FSLDIR}/bin/fsl_sub -F -l ${subjdir}.bedpostX/logs ${FSLDIR}/bin/bedpostx_preproc.sh ${subjdir}` +preprocid=`${FSLDIR}/bin/fsl_sub -T 60 -m as -N bpx_preproc -l ${subjdir}.bedpostX/logs ${FSLDIR}/bin/bedpostx_preproc.sh ${subjdir}` echo Queuing parallel processing stage nslices=`${FSLDIR}/bin/fslval ${subjdir}/data dim3` @@ -146,7 +146,7 @@ bedpostid=`${FSLDIR}/bin/fsl_sub -j $preprocid -l ${subjdir}.bedpostX/logs -M $m [ "x$SGE_ROOT" = "x" ] && kill $monitorpid echo Queuing post processing stage -mergeid=`${FSLDIR}/bin/fsl_sub -j $bedpostid -F -l ${subjdir}.bedpostX/logs ${FSLDIR}/bin/bedpostx_postproc.sh $subjdir` +mergeid=`${FSLDIR}/bin/fsl_sub -j $bedpostid -T 60 -m as -N bpx_postproc -l ${subjdir}.bedpostX/logs ${FSLDIR}/bin/bedpostx_postproc.sh $subjdir` if [ "x$SGE_ROOT" != "x" ]; then echo diff --git a/bedpostx_postproc.sh b/bedpostx_postproc.sh index 302b7d10e34d00e3071ecf692345619633a7f1e2..180cee92dd37ff390b5e7b82f3035f47bc0db303 100755 --- a/bedpostx_postproc.sh +++ b/bedpostx_postproc.sh @@ -1,12 +1,5 @@ #!/bin/sh -#$ -cwd -#$ -q short.q -#$ -S /bin/sh -#$ -V -#$ -N bpx_postproc -#$ -m ae - subjdir=$1 numfib=`${FSLDIR}/bin/imglob -oneperimage ${subjdir}.bedpostX/diff_slices/data_slice_0000/f*samples | wc -w | awk '{print $1}'` diff --git a/bedpostx_preproc.sh b/bedpostx_preproc.sh index 90123ca5fca76cea110863770df045c50d08d7ed..0fab6d43656a4834fe225bee0f42bc481c91ba00 100755 --- a/bedpostx_preproc.sh +++ b/bedpostx_preproc.sh @@ -1,12 +1,5 @@ #!/bin/sh -#$ -cwd -#$ -q short.q -#$ -S /bin/sh -#$ -V -#$ -N bpx_preproc -#$ -m as - subjdir=$1 echo Copying files to bedpost directory diff --git a/bedpostx_single_slice.sh b/bedpostx_single_slice.sh index 8934d1a4ae1468f7d0412df3f12cc8a364de49ca..cf83870c7d2c01cf81d6c450b92b0598b4b1f53d 100755 --- a/bedpostx_single_slice.sh +++ b/bedpostx_single_slice.sh @@ -1,13 +1,5 @@ #!/bin/sh -#$ -cwd -#$ -q long.q -#$ -S /bin/sh -#$ -V -#$ -N bedpostx -#$ -m n -#$ -o $1.bedpostX/logs -e $1.bedpostX/logs - subjdir=$1 nfibres=$2 fudge=$3 @@ -16,7 +8,6 @@ njumps=$5 sampleevery=$6 slice=$7 - slicezp=`${FSLDIR}/bin/zeropad $slice 4` ${FSLDIR}/bin/xfibres\