From 86518fd1b47cc27db4e24de19674e82a62dac8da Mon Sep 17 00:00:00 2001
From: Norbert Herrmann <n.herrmann@gsi.de>
Date: Wed, 12 Mar 2025 16:19:17 +0100
Subject: [PATCH] post Au2025 cleanup of scripts
---
MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in | 3 ++-
macro/beamtime/mcbm2025/calTof.sh | 4 ++--
macro/beamtime/mcbm2025/mcbm_align.sh | 2 +-
macro/beamtime/mcbm2025/mcbm_eval_tof.sh | 4 ++--
macro/beamtime/mcbm2025/mcbm_fde_align.C | 4 ++--
macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in b/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in
index f04a18015..c688ada05 100755
--- a/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in
+++ b/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in
@@ -21,7 +21,8 @@ if [ $# -ge 3 ]; then
_pubminsec=5.0
_pubmaxsec=20.0
- if [ $# -ge 6 ]; then
+ #if [ $# -ge 6 ]; then
+ if [ $# -eq 6 ]; then
_filename=""
_dirname=""
_FilterLevel=$4
diff --git a/macro/beamtime/mcbm2025/calTof.sh b/macro/beamtime/mcbm2025/calTof.sh
index 96833237b..9fb299b07 100755
--- a/macro/beamtime/mcbm2025/calTof.sh
+++ b/macro/beamtime/mcbm2025/calTof.sh
@@ -117,8 +117,8 @@ rm ${UpdateLog}
ChildJobName=cal$SJI
#QUEUE="-p main -t 480 --mem 8000 -J $ChildJobName "
-#QUEUE="-p high_mem -t 480 --mem 8000 -J $ChildJobName "
-QUEUE="-p high_mem -t 1000 -A cbm_online --mem 8000 --reservation=cbm_online -J $ChildJobName "
+QUEUE="-p high_mem -t 480 --mem 8000 -J $ChildJobName "
+#QUEUE="-p high_mem -t 1000 -A cbm_online --mem 8000 --reservation=cbm_online -J $ChildJobName "
if [ $NTs -le 20 ] && [ $AOpt -ge 100 ]; then
QUEUE="-p high_mem -t 300:00 --mem 8000 -J $ChildJobName "
fi
diff --git a/macro/beamtime/mcbm2025/mcbm_align.sh b/macro/beamtime/mcbm2025/mcbm_align.sh
index 750ae8dbc..9bc9ac846 100755
--- a/macro/beamtime/mcbm2025/mcbm_align.sh
+++ b/macro/beamtime/mcbm2025/mcbm_align.sh
@@ -65,7 +65,7 @@ if [ $NTs -le 10 ] && [ $ACut -ge 100 ]; then
QUEUE="-p debug -t 30:00 --mem 16000 "
fi
-RESERVATION=" --reservation=cbm_online --account=cbm_online"
+#RESERVATION=" --reservation=cbm_online --account=cbm_online"
iter=0;
if [ $cRun -lt 2400 ]; then
diff --git a/macro/beamtime/mcbm2025/mcbm_eval_tof.sh b/macro/beamtime/mcbm2025/mcbm_eval_tof.sh
index 845239d47..db965ed58 100755
--- a/macro/beamtime/mcbm2025/mcbm_eval_tof.sh
+++ b/macro/beamtime/mcbm2025/mcbm_eval_tof.sh
@@ -83,8 +83,8 @@ if [ $NTs -le 10 ] && [ $ACut -ge 100 ]; then
QUEUE="-p debug -t 30:00 --mem 16000 -J $ChildJobName "
fi
if [ $NTs -gt 200 ]; then
- #QUEUE="-p high_mem -t 500:00 --mem 16000 -J $ChildJobName "
- QUEUE="-p high_mem -A cbm_online --reservation=cbm_online -t 500:00 --mem 16000 -J $ChildJobName "
+ QUEUE="-p high_mem -t 500:00 --mem 16000 -J $ChildJobName "
+ #QUEUE="-p high_mem -A cbm_online --reservation=cbm_online -t 500:00 --mem 16000 -J $ChildJobName "
fi
FIdreduced=${FId#*.} # removes Trigger field
FilterLevel=${FIdreduced:0:2}
diff --git a/macro/beamtime/mcbm2025/mcbm_fde_align.C b/macro/beamtime/mcbm2025/mcbm_fde_align.C
index 905e72aac..a6f925228 100644
--- a/macro/beamtime/mcbm2025/mcbm_fde_align.C
+++ b/macro/beamtime/mcbm2025/mcbm_fde_align.C
@@ -169,9 +169,9 @@ Bool_t mcbm_fde_align(UInt_t uRunId = 2912,
geoSetupTag = "mcbm_beam_2025_01_31_silver";
iBeamCounterSm=0;
}
- else if (3570 <= uRunId) {
+ else if (3570 <= uRunId) { //Au2025
geoSetupTag = "mcbm_beam_2025_01_31_silver";
- iBeamCounterSm=0;
+ iBeamCounterSm=1;
}
}
TString geoFile = srcDir + "/macro/mcbm/data/" + geoSetupTag + ".geo.root";
diff --git a/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C b/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C
index d3bddc326..25831d399 100644
--- a/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C
+++ b/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C
@@ -174,7 +174,7 @@ Bool_t mcbm_fde_cal_tof(UInt_t uRunId = 2912,
geoSetupTag = "mcbm_beam_2025_01_31_silver"; // to be updated
iBeamCounterSm=0;
}
- else if (3560 <= uRunId) {
+ else if (3560 <= uRunId) { // Au2025
geoSetupTag = "mcbm_beam_2025_01_31_silver";
iBeamCounterSm=1;
}
--
GitLab