diff --git a/macros/CCEScan/batch/submitHamburg-IT.sh b/macros/CCEScan/batch/submitHamburg-IT.sh index 7517f1d..b08915e 100644 --- a/macros/CCEScan/batch/submitHamburg-IT.sh +++ b/macros/CCEScan/batch/submitHamburg-IT.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: 2016-01-15 10:35:16 # Locations swsource=$HOME/STAging/macros/CCEScan @@ -12,61 +12,13 @@ # Backup old data echo "Backup file!" -echo "cp /disk/data1/hep/elena/data/ST/Aging/Hamburg.root /disk/data1/hep/elena/data/ST/Aging/Hamburg_backup_Jan16.root" -cp /disk/data1/hep/elena/data/ST/Aging/Hamburg.root /disk/data1/hep/elena/data/ST/Aging/Hamburg_backup_Jan16.root - -# TT radii -rads=(75 45 40) +echo "cp /disk/data1/hep/elena/data/ST/Aging/Hamburg.root /disk/data1/hep/elena/data/ST/Aging/Hamburg_backup_Jan16_2.root" +cp /disk/data1/hep/elena/data/ST/Aging/Hamburg.root /disk/data1/hep/elena/data/ST/Aging/Hamburg_backup_Jan16_2.root # Prepare script -scriptname="hamburg_allTT_allIT" +scriptname="hamburg_allIT" cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.sh -echo "Preparing running conditions:" - -# Fluka simulation -# ================ -# If there is a new Fluka map, get it and run flukaExtract. -# If the energy is different, you'll have to modify -# all the other files to account for it. - -# Luminosity -# ========== -# Get the latest lumi files from: -# https://lbgroups.cern.ch/online/OperationsPlots/index_files/ -# and run lumiExtract, possibly you will have to -# modify lines 82+. - -# Temperature -# =========== -# Make sure you run "python getTempFromPlus.py 2016" from lxplus first -echo "${runCondSw}/tempExtract -b" >> $scripts/temp_scripts/${scriptname}.sh - -# Fluence -# ======= -# This is the slowest part (fluence extract) -echo "${runCondSw}/fluenceExtract -b" >> $scripts/temp_scripts/${scriptname}.sh -for rad in "${rads[@]}" -do - echo "${runCondSw}/fluenceExtract -d TT -r ${rad} -b" >> $scripts/temp_scripts/${scriptname}.sh -done -echo "${runCondSw}/fluenceExtract -d IT -b" >> $scripts/temp_scripts/${scriptname}.sh -echo "${runCondSw}/fluenceExtract -d IT -r 175 -b" >> $scripts/temp_scripts/${scriptname}.sh - -# TT Hamburg model predictions -# ============================ -echo "Preparing TT:" -for sector in `cat $swsource/TTsectors.dat` -do - echo "${swsource}/Hamburg -d TT -l TTaU -s ${sector} -b" >> $scripts/temp_scripts/${scriptname}.sh -done -for sector in `cat $swsource/TTinner.dat` -do - for rad in "${rads[@]}" - do - echo "${swsource}/Hamburg -d TT -l TTaU -s ${sector} -r ${rad} -b" >> $scripts/temp_scripts/${scriptname}.sh - done -done # IT Hamburg model predictions # ============================ @@ -90,4 +42,4 @@ # Hamburg alone = 100 s per sector --> 11500 s # Full TT issue of fluenceExtract = ~20 min (1210 s) # --> total ~6*1210 s = 7260 s -qsub -l cput=250000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe +qsub -l cput=99000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe