diff --git a/macros/CCEScan/batch/base.sh b/macros/CCEScan/batch/base.sh index 9125e9c..86aa5ed 100644 --- a/macros/CCEScan/batch/base.sh +++ b/macros/CCEScan/batch/base.sh @@ -1,3 +1,4 @@ +#!/bin/bash source /home/hep/egraveri/.bashrc export LHCBSTYLE=1 export DISK=/disk/data1/hep/elena diff --git a/macros/CCEScan/batch/submitLandau.sh b/macros/CCEScan/batch/submitLandau.sh index c32a226..f658a92 100644 --- a/macros/CCEScan/batch/submitLandau.sh +++ b/macros/CCEScan/batch/submitLandau.sh @@ -1,5 +1,12 @@ #!/bin/bash +# SLURM +# To monitor/delete jobs do: +# squeue/scancel -u egraveri +# Manual: +# https://www.rc.fas.harvard.edu/resources/documentation/convenient-slurm-commands/ + +# TORQUE # to remove erroneous jobs: # for job in `qstat | grep ${USER} | awk '{print $1;}'`; do qdel ${job}@farm-ce; done @@ -20,7 +27,7 @@ echo "Submitting TT:" #for fill in `cat $swsource/Fills.dat` -for fill in $onefill +for fill in "${onefill[@]}" do echo " Submitting fill "$fill for sector in `cat $swsource/TTsectors.dat` @@ -28,6 +35,7 @@ echo " Sector "$sector scriptname="landauFit_TT_f${fill}_s${sector}_allSteps_allVal" cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm + chmod 777 $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} do for val in "${vals[@]}" @@ -42,7 +50,7 @@ echo "Submitting TT inner sectors:" #for fill in `cat $swsource/Fills.dat` -for fill in $onefill +for fill in "${onefill[@]}" do echo " Submitting fill "$fill for sector in `cat $swsource/TTinner.dat` @@ -50,6 +58,7 @@ echo " Sector "$sector scriptname="landauFit_TTinner_f${fill}_s${sector}_allSteps_allVal_allRads" cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm + chmod 777 $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} do for val in "${vals[@]}" @@ -72,7 +81,7 @@ for sector in `cat $swsource/ITsectors.dat` do echo " Sector " $sector - for fill in $onefill + for fill in "${onefill[@]}" #for fill in `cat $swsource/Fills.dat` do echo " Fill "$fill @@ -80,6 +89,7 @@ scriptname="landauFit_IT_s${sector}_f${fill}_allSteps_v${val}" echo "Creating file " $scripts/temp_scripts/${scriptname}.slurm cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm + chmod 777 $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} do echo "${swsource}/landauFit -d IT -l T3X2 -s ${sector} -f ${fill} -c ${i} -v ${val} -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm @@ -93,13 +103,14 @@ for sector in `cat $swsource/ITinner.dat` do echo " Sector " $sector - for fill in $onefill + for fill in "${onefill[@]}" #for fill in `cat $swsource/Fills.dat` do echo " Fill "$fill val=7 scriptname="landauFit_ITinner_s${sector}_f${fill}_allSteps_v${val}_r175" cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm + chmod 777 $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} do echo "${swsource}/landauFit -d IT -l T3X2 -s ${sector} -f ${fill} -c ${i} -v ${val} -r 175 -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm