diff --git a/macros/CCEScan/batch/base.sh b/macros/CCEScan/batch/base.sh index 2c0aaa2..64ce724 100644 --- a/macros/CCEScan/batch/base.sh +++ b/macros/CCEScan/batch/base.sh @@ -1,27 +1,33 @@ #!/bin/bash -source /home/hep/egraveri/.bashrc + + + +source /home/hep/matzeni/.bashrc export LHCBSTYLE=1 -export DISK=/disk/data1/hep/elena -export CCEHOME=/home/hep/egraveri/STAging +export CCEHOME=/home/hep/matzeni/STAging/ +export DISK=/disk/data12/lhcb/STAgeingData + + + 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 +# if [[ -f /etc/SuSE-release ]]; then + CERN=/app/cern + #ROOTSYS=$CERN/root_v5.34.34/root + ROOTSYS=$CERN/root_v6.08.06 + #ROOTSYS=$CERN/root_v6.02.10/root-6.02.10 + 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 } restart_root diff --git a/macros/CCEScan/batch/submitLandau.sh b/macros/CCEScan/batch/submitLandau.sh old mode 100644 new mode 100755 index f658a92..75a0ea3 --- a/macros/CCEScan/batch/submitLandau.sh +++ b/macros/CCEScan/batch/submitLandau.sh @@ -10,20 +10,23 @@ # 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=/home/hep/matzeni/STAging/macros/CCEScan scripts=$swsource/batch -logs=/disk/data1/hep/elena/logs/ST/CCEScan +DISK=/disk/data12/lhcb/STAgeingData +logs=$DISK/data/ST/ #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_pre5934.root" +cp $DISK/data/ST/Aging/CCEScan.root $DISK/data/ST/Aging/CCEScan_backup_pre5934.root #onefill=(5448) -onefill=(4643 4856 5162 5448) +#onefill=(5746) +onefill=(5934) #CHANGE ALSO THE NAME TO THE BACKUP!!!!!!!!!!!!!!!!!! + echo "Submitting TT:" #for fill in `cat $swsource/Fills.dat` @@ -34,6 +37,7 @@ do echo " Sector "$sector scriptname="landauFit_TT_f${fill}_s${sector}_allSteps_allVal" + mkdir -p $scripts/temp_scripts #Added by Michele cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm chmod 777 $scripts/temp_scripts/${scriptname}.slurm for i in {0..65} @@ -43,7 +47,7 @@ echo "${swsource}/landauFit -d TT -l TTaU -s ${sector} -f ${fill} -c ${i} -v ${val} -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm done done - sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log + sbatch -p standard --ntasks-per-node=2 $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log #sleep 2 done done @@ -69,7 +73,7 @@ done done done - sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log + sbatch -p standard --ntasks-per-node=2 $scripts/temp_scripts/${scriptname}.slurm -o ${logs}${scriptname}.log -e ${logs}${scriptname}.log #sleep 2 done done @@ -94,7 +98,7 @@ do echo "${swsource}/landauFit -d IT -l T3X2 -s ${sector} -f ${fill} -c ${i} -v ${val} -b -ss" >> $scripts/temp_scripts/${scriptname}.slurm done - sbatch -p standard $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log + sbatch -p standard --ntasks-per-node=2 $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log sleep 1 done done @@ -115,9 +119,10 @@ 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 + sbatch -p standard --ntasks-per-node=2 $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log sleep 1 done done +#rm -r $scripts/temp_scripts