diff --git a/algo/base/Definitions.h b/algo/base/Definitions.h index dee31c8dcee4d8256f1c570e18dde9573676389c..6c6d77ba8715786fada47c3483207254bb269b49 100644 --- a/algo/base/Definitions.h +++ b/algo/base/Definitions.h @@ -52,6 +52,7 @@ namespace cbm::algo mCBM2022, mCBM2024_03, mCBM2024_05, + mCBM2025_02, }; enum class QaStep @@ -122,7 +123,8 @@ CBM_ENUM_DICT(cbm::algo::RecoData, CBM_ENUM_DICT(cbm::algo::Setup, {"mCBM2022", cbm::algo::Setup::mCBM2022}, {"mCBM2024_03", cbm::algo::Setup::mCBM2024_03}, - {"mCBM2024_05", cbm::algo::Setup::mCBM2024_05} + {"mCBM2024_05", cbm::algo::Setup::mCBM2024_05}, + {"mCBM2025_02", cbm::algo::Setup::mCBM2025_02} ); CBM_ENUM_DICT(cbm::algo::QaStep, diff --git a/algo/global/ParFiles.cxx b/algo/global/ParFiles.cxx index e265df9865d58c37655b5e7931f4e943c450df48..b704ef84e27587886d48796ab8b1c0302de74771 100644 --- a/algo/global/ParFiles.cxx +++ b/algo/global/ParFiles.cxx @@ -15,9 +15,12 @@ ParFiles::ParFiles(uint32_t runId) else if (runId < 2918) { setup = Setup::mCBM2024_03; } - else { + else if (runId < 3400) { setup = Setup::mCBM2024_05; } + else { + setup = Setup::mCBM2025_02; + } switch (setup) { @@ -81,6 +84,26 @@ ParFiles::ParFiles(uint32_t runId) ca.mainConfig = "mcbm2024_05/TrackingChainConfig.yaml"; break; + case Setup::mCBM2025_02: + bmon.readout = "mcbm2025_02/BmonReadout_mcbm2024.yaml"; + + sts.readout = "mcbm2025_02/StsReadout_mcbm2024.yaml"; + sts.chanMask = "mcbm2025_02/StsChannelMaskSet_mcbm2024.yaml"; + sts.walkMap = "mcbm2025_02/StsWalkMap_mcbm2024.yaml"; + sts.hitfinder = "mcbm2025_02/StsHitfinder.yaml"; + + tof.readout = "mcbm2025_02/TofReadout.yaml"; + tof.calibrate = "mcbm2025_02/TofCalibratePar.yaml"; + tof.hitfinder = "mcbm2025_02/TofHitfinderPar.yaml"; + + trd.readout = "mcbm2025_02/TrdReadoutSetup.yaml"; + trd.readout2d = "mcbm2025_02/Trd2dReadoutSetup.yaml"; + trd.hitfinder = "mcbm2025_02/TrdHitfinderPar.yaml"; + trd.hitfinder2d = "mcbm2025_02/TrdHitfinder2DPar.yaml"; + + ca.mainConfig = "mcbm2025_02/TrackingChainConfig.yaml"; + break; + default: throw FatalError("Unknown setup: {}", ToString(setup)); } } diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index d320c5496a408e89511ecc4361723ed2587066e3..74e6f43126f4c5990ecbe4300caade7e4469b631 100644 --- a/external/InstallParameter.cmake +++ b/external/InstallParameter.cmake @@ -1,4 +1,4 @@ -set(PARAMETER_VERSION 6959ee1375164fe0a620fc46ba57f1d4ca254fce) # 2025/02/07 +set(PARAMETER_VERSION ab9972f137bc52efd58bf3672e670a2d4fbcb1be) # 2025/02/11 set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git") download_project_if_needed(PROJECT Parameter_source