diff --git a/algo/global/Reco.cxx b/algo/global/Reco.cxx index 9626a1f25a52655e78654a26dcb058138057a069..a935c3e1f38553f293584b6520af3b56b1edabfb 100644 --- a/algo/global/Reco.cxx +++ b/algo/global/Reco.cxx @@ -111,12 +111,20 @@ void Reco::Init(const Options& opts) } if (Opts().Has(Subsystem::STS) && Opts().Has(Step::Unpack)) { - fs::path readoutFile = 2724 <= Opts().RunId() ? "StsReadout_mcbm2024.yaml" : "StsReadout_mcbm2022.yaml"; + fs::path readoutFile = "StsReadout_mcbm2022.yaml"; + fs::path chanMaskFile = "StsChannelMaskSet_mcbm2022.yaml"; + fs::path walkFile = "StsWalkMap_mcbm2022.yaml"; + if (2724 <= Opts().RunId()) { + readoutFile = "StsReadout_mcbm2024.yaml"; + chanMaskFile = "StsChannelMaskSet_mcbm2024.yaml"; + walkFile = "StsWalkMap_mcbm2024.yaml"; + } + sts::ReadoutSetup readoutSetup = yaml::ReadFromFile<sts::ReadoutSetup>(Opts().ParamsDir() / readoutFile); - auto chanMask = yaml::ReadFromFile<sts::ChannelMaskSet>(Opts().ParamsDir() / "StsChannelMaskSet.yaml"); + auto chanMask = yaml::ReadFromFile<sts::ChannelMaskSet>(Opts().ParamsDir() / chanMaskFile); + auto walkMap = yaml::ReadFromFile<sts::WalkMap>(Opts().ParamsDir() / walkFile); + sts::ReadoutConfig readout{readoutSetup, chanMask}; - fs::path walkFile = 2724 <= Opts().RunId() ? "StsWalkMap_mcbm2024.yaml" : "StsWalkMap_mcbm2022.yaml"; - auto walkMap = yaml::ReadFromFile<sts::WalkMap>(Opts().ParamsDir() / walkFile); sts::Unpack::Config cfg{.readout = readout, .walkMap = walkMap}; fStsUnpack = std::make_unique<sts::Unpack>(cfg); if (fSender != nullptr) {