diff --git a/macros/CCEScan/batch/base.sh b/macros/CCEScan/batch/base.sh index 2c0aaa2..89adec3 100644 --- a/macros/CCEScan/batch/base.sh +++ b/macros/CCEScan/batch/base.sh @@ -1,7 +1,8 @@ #!/bin/bash source /home/hep/egraveri/.bashrc export LHCBSTYLE=1 -export DISK=/disk/data1/hep/elena +# export DISK=/disk/data1/hep/elena +export DISK=/disk/data12/lhcb/STAgeingData export CCEHOME=/home/hep/egraveri/STAging restart_root(){ if [[ -f /etc/SuSE-release ]]; then diff --git a/macros/CCEScan/batch/submitHamburg.sh b/macros/CCEScan/batch/submitHamburg.sh index 939eb9f..18e5a30 100644 --- a/macros/CCEScan/batch/submitHamburg.sh +++ b/macros/CCEScan/batch/submitHamburg.sh @@ -2,18 +2,18 @@ # @Author: Elena Graverini # @Date: 2016-01-13 10:52:22 # @Last Modified by: Elena Graverini -# @Last Modified time: 2017-09-01 19:26:46 +# @Last Modified time: 2017-09-01 20:00:55 # Locations -swsource=$HOME/STAging/macros/CCEScan -runCondSw=$HOME/STAging/macros/runCond +swsource=$CCEHOME/macros/CCEScan +runCondSw=$CCEHOME/macros/runCond scripts=$swsource/batch -logs=/disk/data1/hep/elena/logs/ST/CCEScan +logs=$DISK/logs/ST/CCEScan # 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_nov29.root" -cp /disk/data1/hep/elena/data/ST/Aging/Hamburg.root /disk/data1/hep/elena/data/ST/Aging/Hamburg_backup_nov29.root +echo "cp $DISK/data/ST/Aging/Hamburg.root $DISK/data/ST/Aging/Hamburg_backup_20170901.root" +cp $DISK/data/ST/Aging/Hamburg.root $DISK/data/ST/Aging/Hamburg_backup_20170901.root # TT radii rads=(75 45 40) @@ -78,6 +78,7 @@ for sector in `cat $swsource/ITinner.dat` do echo "${swsource}/Hamburg -d IT -l T3X2 -s ${sector} -r 175 -b" >> $scripts/temp_scripts/${scriptname}.slurm + echo "${swsource}/Hamburg -d IT -l T3X2 -s ${sector} -r 40 -b" >> $scripts/temp_scripts/${scriptname}.slurm done # Submit job diff --git a/macros/CCEScan/batch/submitLandau.sh b/macros/CCEScan/batch/submitLandau.sh index f658a92..771a5d1 100644 --- a/macros/CCEScan/batch/submitLandau.sh +++ b/macros/CCEScan/batch/submitLandau.sh @@ -10,17 +10,17 @@ # to remove erroneous jobs: # for job in `qstat | grep ${USER} | awk '{print $1;}'`; do qdel ${job}@farm-ce; done -swsource=$HOME/STAging/macros/CCEScan +swsource=$CCEHOME/macros/CCEScan scripts=$swsource/batch -logs=/disk/data1/hep/elena/logs/ST/CCEScan +logs=$DISK/logs/ST/CCEScan #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_May29.root" -cp /disk/data1/hep/elena/data/ST/Aging/CCEScan.root /disk/data1/hep/elena/data/ST/Aging/CCEScan_backup_May29.root +echo "cp $DISK/data/ST/Aging/CCEScan.root $DISK/data/ST/Aging/CCEScan_backup_20170901.root" +cp $DISK/data/ST/Aging/CCEScan.root $DISK/data/ST/Aging/CCEScan_backup_20170901.root #onefill=(5448) onefill=(4643 4856 5162 5448)