Merge branch 'master' of ssh://gitlab.cern.ch:7999/CLICdp/tbAnalysis sa

Former-commit-id: 381d94b2c6dbd8f824acf70e24ee5376a0c9b755

branches/trunk/macros/analyse.sh

 #!/bin/bash
 
+# Where the code is and which run to analyse
 TBCODE=..
-RUN=1100
+RUN=${1}
  
-DATADIR=${TBCODE}/example/Run${RUN}
-CONDFILE=${TBCODE}/cond/alignmentRun${RUN}.dat
+# Set up the arguments to be passed to the testbeam code
+CONDFILE=${TBCODE}/cond/Alignment${RUN}.dat
 HISTOFILE=${TBCODE}/histos/histogramsRun${RUN}.root
+INPUTFILE=${TBCODE}/pixels/pixelsRun${RUN}.root
 NEVENTS=-1
-EVENTTIME=0.00005
-STARTTIME=0
 
-${TBCODE}/bin/tbAnalysis -d ${DATADIR} -c ${CONDFILE} -n ${NEVENTS} -h ${HISTOFILE} -t ${EVENTTIME} -o ${STARTTIME}
+# If the alignment file for this run does not exist, get it from the DB
+if [ ! -f ${CONDFILE} ] 
+then
+  while read run align dut thl angle
+  do
+    if [ "$run" == "$RUN" ]
+    then
+      CONDFILE=${TBCODE}/cond/Alignment${align}.dat
+      echo New cond file is ${CONDFILE}
+    fi
+  done <<< "$(grep ${RUN} runListAngledHVCMOS.dat)"
+fi
 
+# Launch the testbeam analysis and replace the original alignment file with the new one
+${TBCODE}/bin/tbAnalysis -c ${CONDFILE} -n ${NEVENTS} -h ${HISTOFILE} -t ${INPUTFILE} 
+