diff --git a/algo/global/ParFiles.cxx b/algo/global/ParFiles.cxx index 1c0f50e9bb06a72c5ec154c428cf9dd4478ab5bd..bc67f0843f7175230cad28c2eba662475741b9e5 100644 --- a/algo/global/ParFiles.cxx +++ b/algo/global/ParFiles.cxx @@ -95,6 +95,8 @@ ParFiles::ParFiles(uint32_t runId) case Setup::mCBM2025_02: bmon.readout = "mcbm2025_02/BmonReadout_mcbm2025.yaml"; + bmon.calibrate = "mcbm2025_05/BmonCalibratePar.yaml"; + bmon.hitfinder = "mcbm2025_05/BmonHitfinderPar.yaml"; sts.readout = "mcbm2025_02/StsReadout_mcbm2025.yaml"; sts.chanMask = "mcbm2025_02/StsChannelMaskSet_mcbm2025.yaml"; diff --git a/core/base/utils/CbmMcbmUtils.cxx b/core/base/utils/CbmMcbmUtils.cxx index 9fc673f14625fb365cd58379a0d427fc4bc876eb..0475abc7dca22cbac129575fd2cc7b72fe4ba907 100644 --- a/core/base/utils/CbmMcbmUtils.cxx +++ b/core/base/utils/CbmMcbmUtils.cxx @@ -57,10 +57,14 @@ namespace cbm /// 2024/03 Gold runs sSetupName = "mcbm_beam_2024_03_22_gold"; } - else if (2918 <= ulRunId) { + else if (2918 <= ulRunId && ulRunId <= 3399) { /// Dummy needed to run the unpack macro until we have a setup ready sSetupName = "mcbm_beam_2024_05_08_nickel"; } + else if (3400 <= ulRunId) { + /// Dummy needed to run the unpack macro until we have a setup ready + sSetupName = "mcbm_beam_2025_02_14_silver"; + } else { /// Missing runs, exception there to force implementation and support from users side throw(std::invalid_argument(Form("RunId %d is not mapped! Please complete the map!", ulRunId))); diff --git a/reco/steer/CbmOnlineParWrite.cxx b/reco/steer/CbmOnlineParWrite.cxx index eac56543db1c458bf2477b5f30f8bcb3810b9c81..658ee50dd66212dcab7b996b671a8f7a306770db 100644 --- a/reco/steer/CbmOnlineParWrite.cxx +++ b/reco/steer/CbmOnlineParWrite.cxx @@ -145,6 +145,10 @@ void CbmOnlineParWrite::AddTof() doCalibration = true; cFname = Form("%s/3026_1_TofCal.hst.root", TofFileFolder.Data()); break; + case Setup::mCBM2025_02: + doCalibration = true; + cFname = Form("%s/3310_1_TofCal.hst.root", TofFileFolder.Data()); + break; default: throw std::runtime_error("TOF: Unknown setup type"); } @@ -247,7 +251,7 @@ void CbmOnlineParWrite::AddSts() sensorParSet->SetParSensor(stsAddress10, sensor6cm); sensorParSet->SetParSensor(stsAddress11, sensor6cm); } - else if (fConfig.setupType == Setup::mCBM2024_03 || fConfig.setupType == Setup::mCBM2024_05) { + else if (fConfig.setupType == Setup::mCBM2024_03 || fConfig.setupType == Setup::mCBM2024_05 || fConfig.setupType == Setup::mCBM2025_02) { uint32_t addr01 = 0x10008012; uint32_t addr02 = 0x10018012; uint32_t addr03 = 0x10008412; @@ -336,6 +340,7 @@ void CbmOnlineParWrite::Run(const Config& config) case Setup::mCBM2022: runId = 2391; break; case Setup::mCBM2024_03: runId = 2724; break; case Setup::mCBM2024_05: runId = 2918; break; + case Setup::mCBM2025_02: runId = 3453; break; default: throw std::runtime_error("Unknown setup type"); } geoSetupTag = cbm::mcbm::GetSetupFromRunId(runId);