From a9c6d4ac0786ae76dce7a4a31efc19033c7707df Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Fri, 14 Feb 2025 14:48:38 +0100
Subject: [PATCH 1/4] Online: fix wrong year in name of new par files
---
algo/global/ParFiles.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/algo/global/ParFiles.cxx b/algo/global/ParFiles.cxx
index eabec37b4b..1c0f50e9bb 100644
--- a/algo/global/ParFiles.cxx
+++ b/algo/global/ParFiles.cxx
@@ -94,11 +94,11 @@ ParFiles::ParFiles(uint32_t runId)
break;
case Setup::mCBM2025_02:
- bmon.readout = "mcbm2025_02/BmonReadout_mcbm2024.yaml";
+ bmon.readout = "mcbm2025_02/BmonReadout_mcbm2025.yaml";
- sts.readout = "mcbm2025_02/StsReadout_mcbm2024.yaml";
- sts.chanMask = "mcbm2025_02/StsChannelMaskSet_mcbm2024.yaml";
- sts.walkMap = "mcbm2025_02/StsWalkMap_mcbm2024.yaml";
+ sts.readout = "mcbm2025_02/StsReadout_mcbm2025.yaml";
+ sts.chanMask = "mcbm2025_02/StsChannelMaskSet_mcbm2025.yaml";
+ sts.walkMap = "mcbm2025_02/StsWalkMap_mcbm2025.yaml";
sts.hitfinder = "mcbm2025_02/StsHitfinder.yaml";
tof.readout = "mcbm2025_02/TofReadout.yaml";
--
GitLab
From 6e459afa3e080b7c75684efd1d8c17a5c94bf434 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Fri, 14 Feb 2025 20:24:52 +0100
Subject: [PATCH 2/4] Bump param repo hash to bring (maybe) last missing online
par files for mCBM 2025
---
external/InstallParameter.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake
index 74e6f43126..c8f4d23f40 100644
--- a/external/InstallParameter.cmake
+++ b/external/InstallParameter.cmake
@@ -1,4 +1,4 @@
-set(PARAMETER_VERSION ab9972f137bc52efd58bf3672e670a2d4fbcb1be) # 2025/02/11
+set(PARAMETER_VERSION db53df993ef7b4b977bae554763ebff7f5bf84f7) # 2025/02/14
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
download_project_if_needed(PROJECT Parameter_source
--
GitLab
From 9cfdbd9aea612c46b0e7d381fd750e662a8c5870 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Fri, 14 Feb 2025 21:26:55 +0100
Subject: [PATCH 3/4] online: in TOF unpacker ReadoutConfig, temp-fix bad
module type based on NH lustre files (maybe incomplete)
---
algo/detectors/tof/ReadoutConfig.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/algo/detectors/tof/ReadoutConfig.cxx b/algo/detectors/tof/ReadoutConfig.cxx
index aab8e3ebf8..3323882010 100644
--- a/algo/detectors/tof/ReadoutConfig.cxx
+++ b/algo/detectors/tof/ReadoutConfig.cxx
@@ -185,12 +185,13 @@ namespace cbm::algo::tof
const auto& crob = pars.crobs.at(uGbtx);
switch (crob.rpcType) {
case 2: // intended fall-through
+ case 1: // intended fall-through
case 0: {
// CBM modules
BuildChannelsUidMapCbm(uCh, crob);
break;
}
- case 1: {
+ case 11: {
// STAR eTOF modules
BuildChannelsUidMapStar(uCh, crob);
break;
--
GitLab
From c012ae7862ee4d3057c4392c9ec86dc29902fa36 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Fri, 14 Feb 2025 22:46:56 +0100
Subject: [PATCH 4/4] Fixes to CI test for online binary
---
algo/test/CMakeLists.txt | 2 +-
algo/test/realdata_test.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/algo/test/CMakeLists.txt b/algo/test/CMakeLists.txt
index be43848e9f..f913f43171 100644
--- a/algo/test/CMakeLists.txt
+++ b/algo/test/CMakeLists.txt
@@ -40,7 +40,7 @@ if (DEFINED ENV{RAW_DATA_PATH})
Message( STATUS "MR or Continuous model detected, decreasing TS nb for OnlineReco tests to single one." )
SET( RECO_TS_NB 1)
SET( RECO_THREADS_NB $ENV{number_of_processors_for_test})
- SET( ONLINE_RECO_TO 100) # MR mode on run4: 45-50s for 2391
+ SET( ONLINE_RECO_TO 200) # MR mode on run4: 45-50s for 2391
elseif(${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile )
Message( STATUS "Profiling model detected, increasing timeout and TS nb for OnlineReco tests with coverage." )
SET( RECO_TS_NB 20)
diff --git a/algo/test/realdata_test.sh b/algo/test/realdata_test.sh
index de0408fe06..210b4ac553 100755
--- a/algo/test/realdata_test.sh
+++ b/algo/test/realdata_test.sh
@@ -91,4 +91,4 @@ ensure_gt_zero "$log" "Triggers: %1, events %2"
ensure_gt_zero "$log" "TS contains Hits: STS=%1 TOF=%2 TRD=%3"
# Check Tracks
-ensure_gt_zero "$log" "TrackingChain: Timeslice contains %1 tracks, with %2 sts hits, %3 tof hits, 0 trd hits;"
+ensure_gt_zero "$log" "TrackingChain: Timeslice contains %1 tracks, with %2 sts hits, %3 tof hits, %4 trd hits;"
--
GitLab