diff --git a/algo/detectors/tof/ReadoutConfig.cxx b/algo/detectors/tof/ReadoutConfig.cxx index aab8e3ebf865109694cd4409b721aec5c510a7cd..33238820100e333a7709b3d3d131b0b1beea308c 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; diff --git a/algo/global/ParFiles.cxx b/algo/global/ParFiles.cxx index eabec37b4b13cdcbcf8e25e137d37fdfa6b384ba..1c0f50e9bb06a72c5ec154c428cf9dd4478ab5bd 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"; diff --git a/algo/test/CMakeLists.txt b/algo/test/CMakeLists.txt index be43848e9f393c352b3afa264285d594c8d564d6..f913f4317142857b7358dc497e675d641dc236ce 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 de0408fe06b60def44a9d4f87b44c7eec69f7890..210b4ac55320d4547417c94b8bdcf13e0a00e7b5 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;" diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index 74e6f43126f4c5990ecbe4300caade7e4469b631..c8f4d23f40419581d3a49b55358f9c81dc0d612f 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