diff --git a/macros/CCEScan/batch/base.sh b/macros/CCEScan/batch/base.sh index 89adec3..5c3a886 100644 --- a/macros/CCEScan/batch/base.sh +++ b/macros/CCEScan/batch/base.sh @@ -4,25 +4,49 @@ # 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 +# CERN=/app/cern +# #ROOTSYS=$CERN/root_v5.34.25/root +# #ROOTSYS=$CERN/root_v6.06.00/root-6.06.00 +# #ROOTSYS=$CERN/root_v6.02.10/root-6.02.10 +# ROOTSYS=$CERN/root_v6.08.06 +# PATH=$PATH:$ROOTSYS/bin +# export PATH=$PATH:$ROOTSYS/bin +# LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib +# export LD_LIBRARY_PATH=$ROOTSYS/lib:$PYTHONDIR/lib:$LD_LIBRARY_PATH +# export PYTHONPATH=$PYTHONPATH:$ROOTSYS/lib +# else +# ROOTSYS=/cvmfs/lhcb.cern.ch/lib/lcg/app/releases/ROOT/5.34.10/x86_64-slc6-gcc48-opt/root +# PATH=$PATH:$ROOTSYS/bin +# LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib +# cd $ROOTSYS +# source $ROOTSYS/bin/thisroot.sh +# cd - > /dev/null +# fi +# } + restart_root(){ - if [[ -f /etc/SuSE-release ]]; then +# if [[ -f /etc/SuSE-release ]]; then CERN=/app/cern - #ROOTSYS=$CERN/root_v5.34.25/root - #ROOTSYS=$CERN/root_v6.06.00/root-6.06.00 + #ROOTSYS=$CERN/root_v5.34.34/root + ROOTSYS=$CERN/root_v6.08.06 #ROOTSYS=$CERN/root_v6.02.10/root-6.02.10 - ROOTSYS=$CERN/root_v6.08.06 PATH=$PATH:$ROOTSYS/bin - export PATH=$PATH:$ROOTSYS/bin LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib + export ROOTSYS=$CERN/root_v6.08.06 + export PATH=$PATH:$ROOTSYS/bin export LD_LIBRARY_PATH=$ROOTSYS/lib:$PYTHONDIR/lib:$LD_LIBRARY_PATH export PYTHONPATH=$PYTHONPATH:$ROOTSYS/lib - else - ROOTSYS=/cvmfs/lhcb.cern.ch/lib/lcg/app/releases/ROOT/5.34.10/x86_64-slc6-gcc48-opt/root - PATH=$PATH:$ROOTSYS/bin - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib - cd $ROOTSYS - source $ROOTSYS/bin/thisroot.sh - cd - > /dev/null - fi +# else +# ROOTSYS=/cvmfs/lhcb.cern.ch/lib/lcg/app/releases/ROOT/5.34.10/x86_64-slc6-gcc48-opt/root +# PATH=$PATH:$ROOTSYS/bin +# LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ROOTSYS/lib +# cd $ROOTSYS +# source $ROOTSYS/bin/thisroot.sh +# cd - > /dev/null +# fi } + restart_root diff --git a/macros/CCEScan/batch/submitLandau.sh b/macros/CCEScan/batch/submitLandau.sh index 771a5d1..a1dfb4b 100644 --- a/macros/CCEScan/batch/submitLandau.sh +++ b/macros/CCEScan/batch/submitLandau.sh @@ -23,11 +23,11 @@ cp $DISK/data/ST/Aging/CCEScan.root $DISK/data/ST/Aging/CCEScan_backup_20170901.root #onefill=(5448) -onefill=(4643 4856 5162 5448) +#onefill=(4643 4856 5162 5448) echo "Submitting TT:" -#for fill in `cat $swsource/Fills.dat` -for fill in "${onefill[@]}" +for fill in `cat $swsource/Fills.dat` +#for fill in "${onefill[@]}" do echo " Submitting fill "$fill for sector in `cat $swsource/TTsectors.dat` @@ -49,8 +49,8 @@ done echo "Submitting TT inner sectors:" -#for fill in `cat $swsource/Fills.dat` -for fill in "${onefill[@]}" +for fill in `cat $swsource/Fills.dat` +#for fill in "${onefill[@]}" do echo " Submitting fill "$fill for sector in `cat $swsource/TTinner.dat` @@ -81,8 +81,8 @@ for sector in `cat $swsource/ITsectors.dat` do echo " Sector " $sector - for fill in "${onefill[@]}" - #for fill in `cat $swsource/Fills.dat` + #for fill in "${onefill[@]}" + for fill in `cat $swsource/Fills.dat` do echo " Fill "$fill val=7 @@ -103,20 +103,30 @@ for sector in `cat $swsource/ITinner.dat` do echo " Sector " $sector - for fill in "${onefill[@]}" - #for fill in `cat $swsource/Fills.dat` + #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 - done - sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log - sleep 1 + 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 + done + sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log + sleep 1 + # Add rad=40 (rest of sector) + scriptname="landauFit_ITinner_s${sector}_f${fill}_allSteps_v${val}_r40" + 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 40 -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm + done + sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log + sleep 1 done done