diff --git a/data/db/lumi.root b/data/db/lumi.root index 63e9350..5398e4a 100644 --- a/data/db/lumi.root +++ b/data/db/lumi.root Binary files differ diff --git a/data/db/vdepl.root b/data/db/vdepl.root index d545111..1d6c2dc 100644 --- a/data/db/vdepl.root +++ b/data/db/vdepl.root Binary files differ diff --git a/data/temperature/temperature.root b/data/temperature/temperature.root index ae24255..95e2462 100644 --- a/data/temperature/temperature.root +++ b/data/temperature/temperature.root Binary files differ diff --git a/macros/CCEScan/batch/hadd.py b/macros/CCEScan/batch/hadd.py index 0f4ad59..64e6dc1 100644 --- a/macros/CCEScan/batch/hadd.py +++ b/macros/CCEScan/batch/hadd.py @@ -10,10 +10,11 @@ sys.exit(-1) disk = os.path.expandvars('$DISK') + '/data/ST/Aging' +print disk scripts = os.path.expandvars('$CCEHOME') + '/macros/CCEScan' pwd = os.getcwd() haddcmd = os.path.expandvars('$ROOTSYS') + '/bin/hadd' -temp_dir = "/disk/data1/hep/elena/data/ST/Aging" +temp_dir = os.path.expandvars('$DISK') + '/data/ST/Aging' # "/disk/data1/hep/elena/data/ST/Aging" sectors = [] with open('%s/TTsectors.dat' % os.path.dirname(pwd), 'rb') as sectsfile: diff --git a/macros/CCEScan/batch/runPulseAndVoltage.sh b/macros/CCEScan/batch/runPulseAndVoltage.sh index c77bf74..3244f8e 100644 --- a/macros/CCEScan/batch/runPulseAndVoltage.sh +++ b/macros/CCEScan/batch/runPulseAndVoltage.sh @@ -1,9 +1,15 @@ # to remove erroneous jobs: # for job in `qstat | grep ${USER} | awk '{print $1;}'`; do qdel ${job}@farm-ce; done -swsource=$HOME/STAging/macros/CCEScan +export DISK=/disk/data12/lhcb/STAgeingData +export CCEHOME=/home/hep/egraveri/STAging +swsource=$CCEHOME/macros/CCEScan scripts=$swsource/batch -logs=/disk/data1/hep/elena/logs/ST/CCEScan +logs=$DISK/logs/ST/CCEScan + +#swsource=$HOME/STAging/macros/CCEScan +#scripts=$swsource/batch +#logs=/disk/data1/hep/elena/logs/ST/CCEScan vals=(3 5 7) rads=(75 45 40) @@ -35,7 +41,7 @@ for j in {0..10} do echo " Pulse fit for voltage step " $j -# ${swsource}/pulseFit -b -d TT -l TTaU -s ${sector} -f ${fill} -c ${j} -v ${val} + ${swsource}/pulseFit -b -d TT -l TTaU -s ${sector} -f ${fill} -c ${j} -v ${val} done echo " Voltage fit (SPLINE) " ${swsource}/voltageFit_spline -b -d TT -l TTaU -s ${sector} -f ${fill} -v ${val} @@ -69,7 +75,7 @@ for j in {0..10} do echo " Pulse fit for voltage step " $j -# ${swsource}/pulseFit -b -d TT -l TTaU -s ${sector} -f ${fill} -c ${j} -v ${val} -r ${rad} + ${swsource}/pulseFit -b -d TT -l TTaU -s ${sector} -f ${fill} -c ${j} -v ${val} -r ${rad} done echo " Voltage fit (SPLINE) " ${swsource}/voltageFit_spline -b -d TT -l TTaU -s ${sector} -f ${fill} -v ${val} -r ${rad} @@ -102,7 +108,7 @@ for j in {0..10} do echo " Pulse fit for voltage step " $j -# ${swsource}/pulseFit -b -d IT -l T3X2 -s ${sector} -f ${fill} -c ${j} -v ${val} + ${swsource}/pulseFit -b -d IT -l T3X2 -s ${sector} -f ${fill} -c ${j} -v ${val} done echo " Voltage fit (SPLINE) " ${swsource}/voltageFit_spline -b -d IT -l T3X2 -s ${sector} -f ${fill} -v ${val} @@ -133,10 +139,12 @@ for j in {0..10} do echo " Pulse fit for voltage step " $j -# ${swsource}/pulseFit -b -d IT -l T3X2 -s ${sector} -f ${fill} -c ${j} -v ${val} -r ${rad} + ${swsource}/pulseFit -b -d IT -l T3X2 -s ${sector} -f ${fill} -c ${j} -v ${val} -r ${rad} + ${swsource}/pulseFit -b -d IT -l T3X2 -s ${sector} -f ${fill} -c ${j} -v ${val} -r 40 done echo " Voltage fit (SPLINE) " ${swsource}/voltageFit_spline -b -d IT -l T3X2 -s ${sector} -f ${fill} -v ${val} -r ${rad} + ${swsource}/voltageFit_spline -b -d IT -l T3X2 -s ${sector} -f ${fill} -v ${val} -r 40 done done