From dead6d3bf1dda576739fc675eaa388b7966b50d6 Mon Sep 17 00:00:00 2001
From: Norbert Herrmann <n.herrmann@physi.uni-heidelberg.de>
Date: Wed, 25 Nov 2020 19:53:40 +0100
Subject: [PATCH] fix corrupted version
---
macro/beamtime/hd2020/gen_digi.sh | 139 ++++++++++++++++--------------
1 file changed, 76 insertions(+), 63 deletions(-)
diff --git a/macro/beamtime/hd2020/gen_digi.sh b/macro/beamtime/hd2020/gen_digi.sh
index b795efdac6..b1945855d9 100644
--- a/macro/beamtime/hd2020/gen_digi.sh
+++ b/macro/beamtime/hd2020/gen_digi.sh
@@ -1,80 +1,93 @@
-#!/ bin / bash
-#shell script to apply clusterizer calibrations
-#SBATCH - J gen_digi
-#SBATCH \
- - D / lustre / cbm / users / nh / CBM / cbmroot / trunk / macro / beamtime \
- / hd2020
-#SBATCH-- time = 4 : 00 : 00
-#SBATCH-- mem = 2000
-##SBATCH-- partition = long cRun = $1
+#!/bin/bash
+# shell script to apply clusterizer calibrations
+#SBATCH -J gen_digi
+#SBATCH -D /lustre/cbm/users/nh/CBM/cbmroot/trunk/macro/beamtime/hd2020
+#SBATCH --time=8:00:00
+#SBATCH --mem=2000
+##SBATCH --partition=long
+cRun=$1
- iCalSet = $2((iTmp = $iCalSet))((iBRef = $iTmp % 1000))(
- (iTmp = $iTmp - $iBRef))((iSet = $iTmp / 1000))((iRef = $iTmp % 1000000))(
- (iRef = $iRef / 1000))((iTmp = $iTmp - $iRef))((iDut = $iTmp / 1000000))
+iCalSet=$2
+((iTmp = $iCalSet ))
+((iBRef = $iTmp % 1000))
+((iTmp = $iTmp - $iBRef))
+((iSet = $iTmp / 1000))
+((iRef = $iTmp % 1000000))
+((iRef = $iRef / 1000))
+((iTmp = $iTmp - $iRef))
+((iDut = $iTmp / 1000000))
- iSel2 = $3
+iSel2=$3
- if (($ {iSel2} < 0));
-then((iBRef = -$iSel2)) fi
-
- cCalSet = $iCalSet if ((iCalSet < 100000000));
-then cCalSet = "0" $iCalSet fi if ((iCalSet < 10000000));
-then cCalSet = "00" $iCalSet fi if ((iCalSet < 1000000));
-then cCalSet = "000" $iCalSet fi if ((iCalSet < 100000));
-then cCalSet = "0000" $iCalSet fi echo cCalSet = $cCalSet
+cCalSet=$iCalSet
+if (( iCalSet<100000000 )); then
+cCalSet="0"$iCalSet
+fi
+if (( iCalSet<10000000 )); then
+cCalSet="00"$iCalSet
+fi
+if (( iCalSet<1000000 )); then
+cCalSet="000"$iCalSet
+fi
+if (( iCalSet<100000 )); then
+cCalSet="0000"$iCalSet
+fi
+echo cCalSet = $cCalSet
- Deadtime = $4 if [[$ {Deadtime} = ""]];
-then Deadtime = 50. fi
+Deadtime=$4
+if [[ ${Deadtime} = "" ]]; then
+Deadtime=50.
+fi
- CalIdMode = $5 if [[$ {CalIdMode} = ""]];
-then echo use native calibration file CalIdMode = $ {cRun} CalFile =
- $ {cRun} _set$ {cCalSet} _93_1tofClust.hst.root else CalFile =
- $ {CalIdMode} _set$ {cCalSet} _93_1tofClust.hst.root RunFile =
- $ {cRun} _set$ {cCalSet} _93_1tofClust.hst.root
-#rm ${RunFile }
-#ln - s ${CalFile } ${RunFile }
- echo use calibrations from $ {CalFile} fi
+CalIdMode=$5
+if [[ ${CalIdMode} = "" ]]; then
+ echo use native calibration file
+ CalIdMode=${cRun}
+ CalFile=${cRun}_set${cCalSet}_93_1tofClust.hst.root
+else
+ CalFile=${CalIdMode}_set${cCalSet}_93_1tofClust.hst.root
+ RunFile=${cRun}_set${cCalSet}_93_1tofClust.hst.root
+# rm ${RunFile}
+# ln -s ${CalFile} ${RunFile}
+ echo use calibrations from ${CalFile}
+fi
- CalIdSet = $6 if [[$ {CalIdSet} = ""]]; then
+CalIdSet=$6
+if [[ ${CalIdSet} = "" ]]; then
echo use native calibration file
CalIdSet=$cCalSet
else
CalFile=${CalIdMode}_set${CalIdSet}_93_1tofClust.hst.root
fi
+Nevt=$7
+if [[ ${Nevt} = "" ]]; then
+ echo use all events
+ Nevt=-1
+fi
+
echo gen_digi for $cRun with iDut=$iDut, iRef=$iRef, iSet=$iCalSet, iSel2=$iSel2, iBRef=$iBRef, Deadtime=$Deadtime, CalFile=$CalFile
-if [ -e /lustre/cbm ];
-then source / lustre / cbm / users / nh / CBM / cbmroot / trunk / build
- / config.sh wdir = / lustre / cbm / users / nh / CBM / cbmroot / trunk / macro
- / beamtime / mcbm2019 outdir =
- / lustre / cbm / users / nh / CBM / cbmroot / trunk / macro / beamtime
- / mcbm2019 / $ {
- cRun
-}
-else wdir =`pwd` outdir =
- $ {wdir}
- / $ {cRun} fi
+if [ -e /lustre/cbm ]; then
+source /lustre/cbm/users/nh/CBM/cbmroot/trunk/build/config.sh
+wdir=/lustre/cbm/users/nh/CBM/cbmroot/trunk/macro/beamtime/hd2020
+outdir=/lustre/cbm/users/nh/CBM/cbmroot/trunk/macro/beamtime/hd2020/${cRun}
+else
+wdir=`pwd`
+outdir=${wdir}/${cRun}
+fi
- cd $wdir mkdir $cRun cd $cRun cp..
- /.rootrc.cp../ rootlogon.C.cp
- - v..
- / $ {CalFile}.
-#root - b \
- - q './ana_digi.C(-1,93,1,' $iRef ',1,"' $cRun '",' $iCalSet ',1,' $iSel2 ',' $Deadtime ') '
-#root - b \
- - q '../ana_digi_dev.C(-1,93,1,' $iRef ',1,"' $cRun '",' $iCalSet ',1,' $iSel2 ',' $Deadtime ',"' $CalIdMode '") '
- root
- - b
- - q '../ana_digi_cal.C(-1,93,1,' $iRef ',1,"' $cRun '",' $iCalSet ',1,' $iSel2 ',' $Deadtime ',"' $CalIdMode '") '
-#root - b \
- - q '../ana_digi_cos.C(-1,93,1,' $iRef ',1,"' $cRun '",' $iCalSet ',1,' $iSel2 ',' $Deadtime ',"' $CalIdMode '") '
-#root - b \
- - q '../ana_digi_star.C(-1,93,1,' $iRef ',1,"' $cRun '",' $iCalSet ',1,' $iSel2 ',' $Deadtime ',"' $CalIdMode '") '
+cd $wdir
+mkdir $cRun
+cd $cRun
+cp ../.rootrc .
+cp ../rootlogon.C .
+cp -v ../${CalFile} .
+#root -b -q '../ana_digi_cal.C(100000,93,1,'$iRef',1,"'$cRun'",'$iCalSet',1,'$iSel2','$Deadtime',"'$CalIdMode'") '
+root -b -q '../ana_digi_cal.C('$Nevt',93,1,'$iRef',1,"'$cRun'",'$iCalSet',1,'$iSel2','$Deadtime',"'$CalIdMode'") '
+#root -b -q '../ana_digi_cos.C(-1,93,1,'$iRef',1,"'$cRun'",'$iCalSet',1,'$iSel2','$Deadtime',"'$CalIdMode'") '
+#root -b -q '../ana_digi_star.C(-1,93,1,'$iRef',1,"'$cRun'",'$iCalSet',1,'$iSel2','$Deadtime',"'$CalIdMode'") '
- cd..
+cd ..
- mv
- - v slurm
- - $ {SLURM_JOB_ID}.out $ {outdir}
- / GenDigi_$ {cRun} _$ {iCalSet} _$ {iSel2} _$ {iCalIdMode}.out
+mv -v slurm-${SLURM_JOB_ID}.out ${outdir}/GenDigi_${cRun}_${iCalSet}_${iSel2}_${CalIdMode}.out
--
GitLab