diff --git a/macros/CCEScan/batch/submitHamburg.sh b/macros/CCEScan/batch/submitHamburg.sh index 92fed8e..846d037 100644 --- a/macros/CCEScan/batch/submitHamburg.sh +++ b/macros/CCEScan/batch/submitHamburg.sh @@ -2,7 +2,7 @@ # @Author: Elena Graverini # @Date: 2016-01-13 10:52:22 # @Last Modified by: Elena Graverini -# @Last Modified time: 2016-01-13 14:17:17 +# @Last Modified time: 2017-05-29 15:21:46 # Locations swsource=$HOME/STAging/macros/CCEScan diff --git a/macros/CCEScan/batch/submitLandau.sh b/macros/CCEScan/batch/submitLandau.sh index 99e4363..352843b 100644 --- a/macros/CCEScan/batch/submitLandau.sh +++ b/macros/CCEScan/batch/submitLandau.sh @@ -5,14 +5,16 @@ scripts=$swsource/batch logs=/disk/data1/hep/elena/logs/ST/CCEScan -vals=(3 5 7) +#vals=(3 5 7) +vals=(5 7) rads=(75 45 40) echo "Backup file!" -echo "cp /disk/data1/hep/elena/data/ST/Aging/CCEScan.root /disk/data1/hep/elena/data/ST/Aging/CCEScan_backup_May3.root" -cp /disk/data1/hep/elena/data/ST/Aging/CCEScan.root /disk/data1/hep/elena/data/ST/Aging/CCEScan_backup_May3.root +echo "cp /disk/data1/hep/elena/data/ST/Aging/CCEScan.root /disk/data1/hep/elena/data/ST/Aging/CCEScan_backup_May29.root" +cp /disk/data1/hep/elena/data/ST/Aging/CCEScan.root /disk/data1/hep/elena/data/ST/Aging/CCEScan_backup_May29.root -onefill=(5448) +#onefill=(5448) +onefill=(4643 4856 5162 5448) echo "Submitting TT:" #for fill in `cat $swsource/Fills.dat` @@ -23,15 +25,15 @@ do echo " Sector "$sector scriptname="landauFit_TT_f${fill}_s${sector}_allSteps_allVal" - cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.sh + cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} do for val in "${vals[@]}" do - echo "${swsource}/landauFit -d TT -l TTaU -s ${sector} -f ${fill} -c ${i} -v ${val} -b -ss" >> $scripts/temp_scripts/${scriptname}.sh + echo "${swsource}/landauFit -d TT -l TTaU -s ${sector} -f ${fill} -c ${i} -v ${val} -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm done done - qsub -l cput=75000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe + sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log #sleep 2 done done @@ -45,18 +47,18 @@ do echo " Sector "$sector scriptname="landauFit_TTinner_f${fill}_s${sector}_allSteps_allVal_allRads" - cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.sh + cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} do for val in "${vals[@]}" do for rad in "${rads[@]}" do - echo "${swsource}/landauFit -d TT -l TTaU -s ${sector} -f ${fill} -c ${i} -v ${val} -r ${rad} -b -ss" >> $scripts/temp_scripts/${scriptname}.sh + echo "${swsource}/landauFit -d TT -l TTaU -s ${sector} -f ${fill} -c ${i} -v ${val} -r ${rad} -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm done done done - qsub -l cput=225000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe + sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log #sleep 2 done done @@ -74,13 +76,13 @@ echo " Fill "$fill val=7 scriptname="landauFit_IT_s${sector}_f${fill}_allSteps_v${val}" - echo "Creating file " $scripts/temp_scripts/${scriptname}.sh - cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.sh + echo "Creating file " $scripts/temp_scripts/${scriptname}.slurm + cp $scripts/base.sh $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}.sh + echo "${swsource}/landauFit -d IT -l T3X2 -s ${sector} -f ${fill} -c ${i} -v ${val} -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm done - qsub -l cput=24000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe + sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log sleep 1 done done @@ -95,12 +97,12 @@ echo " Fill "$fill val=7 scriptname="landauFit_ITinner_s${sector}_f${fill}_allSteps_v${val}_r175" - cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.sh + cp $scripts/base.sh $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}.sh + echo "${swsource}/landauFit -d IT -l T3X2 -s ${sector} -f ${fill} -c ${i} -v ${val} -r 175 -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm done - qsub -l cput=24000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe + sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log sleep 1 done done