From 0fa38f233df2efb53b89050f78ad27f5e0603260 Mon Sep 17 00:00:00 2001
From: Norbert Herrmann <n.herrmann@physi.uni-heidelberg.de>
Date: Thu, 8 Apr 2021 13:56:12 +0200
Subject: [PATCH] fix inconsistencies introduced by last merge
---
MQ/hitbuilder/startMQ_Mcbm2021.sh | 4 ++--
macro/beamtime/mcbm2021/calib_batch.sh | 2 +-
macro/beamtime/mcbm2021/mTofPar.par | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
mode change 100644 => 100755 macro/beamtime/mcbm2021/calib_batch.sh
diff --git a/MQ/hitbuilder/startMQ_Mcbm2021.sh b/MQ/hitbuilder/startMQ_Mcbm2021.sh
index 1ac20e665e..dba97ce798 100755
--- a/MQ/hitbuilder/startMQ_Mcbm2021.sh
+++ b/MQ/hitbuilder/startMQ_Mcbm2021.sh
@@ -38,7 +38,7 @@ _pultotmax=500
_puldetref=16 # TSR=032
#_tofftof=0.
-_tofftof=-30.
+_tofftof=-35.
if [[ $_reqmod -eq 1 ]]; then
_iUnp=1
@@ -152,7 +152,7 @@ UNPACKER+=" --channel-config name=syscmd,type=sub,method=connect,rateLogging=0,t
UNPACKER+=" --severity INFO"
UNPACKER+=" --SelectComponents 1"
#UNPACKER+=" --ReqBeam 20486" # diamond -> 0x00005006 v14a
-#UNPACKER+=" --ReqBeam 10246" # diamond -> 0x00002806 v21a
+UNPACKER+=" --ReqBeam 10246" # diamond -> 0x00002806 v21a
if [[ $_reqmod -lt 1 ]]; then
UNPACKER+=" --ReqMode 0"
case $_reqmod in
diff --git a/macro/beamtime/mcbm2021/calib_batch.sh b/macro/beamtime/mcbm2021/calib_batch.sh
old mode 100644
new mode 100755
index fd6e87fe73..9dc76d14d4
--- a/macro/beamtime/mcbm2021/calib_batch.sh
+++ b/macro/beamtime/mcbm2021/calib_batch.sh
@@ -78,7 +78,7 @@ source ./init_cal_all.sh ${RunIdMode} ${CalSet} ${Deadtime}
cd ${wdir}
#echo execute: ./iter_calib.sh ${RunIdMode} ${CalSet} ${Sel2} ${Deadtime}
-#source ./iter_calib.sh ${RunIdMode} ${CalSet} ${Sel2} ${Deadtime}
+#source ./iter_calib.sh ${RunIdMode} ${CalSet} ${Sel2} ${Deadtime}
cd ${wdir}
echo execute: ./gen_hits.sh ${RunIdMode} ${CalSet} ${Sel2} ${Deadtime}
diff --git a/macro/beamtime/mcbm2021/mTofPar.par b/macro/beamtime/mcbm2021/mTofPar.par
index 98fb36b2fc..a64f628973 100644
--- a/macro/beamtime/mcbm2021/mTofPar.par
+++ b/macro/beamtime/mcbm2021/mTofPar.par
@@ -2,7 +2,7 @@
//----------------------------------------------------------------------------
NrOfGdpbs: Int_t 9
GdpbIdArray: Int_t \
-0x5b7b 0x55c4 0x18c5 0x5f64 0x18e3 0x181c 0x1922 0x1925 0x1902
+0x5b7b 0x55c4 0x18c5 0x5f64 0x1889 0x181c 0x1922 0x1925 0x1902
NrOfFeesPerGdpb: Int_t 30
NrOfGet4PerFee: Int_t 8
NrOfChannelsPerGet4: Int_t 4
--
GitLab