Skip to content
Snippets Groups Projects
Commit 3a8c9844 authored by Sergei Zharko's avatar Sergei Zharko
Browse files

beamtime2025_02:

- mcbm_beam_2025_02_14_silver setup is added to the runId map;
- actualisation of CbmOnlineParWrite;
- actualisation of ParFiles.cxx
parent c012ae78
No related branches found
No related tags found
1 merge request!2029beamtime2025_02:
...@@ -95,6 +95,8 @@ ParFiles::ParFiles(uint32_t runId) ...@@ -95,6 +95,8 @@ ParFiles::ParFiles(uint32_t runId)
case Setup::mCBM2025_02: case Setup::mCBM2025_02:
bmon.readout = "mcbm2025_02/BmonReadout_mcbm2025.yaml"; 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.readout = "mcbm2025_02/StsReadout_mcbm2025.yaml";
sts.chanMask = "mcbm2025_02/StsChannelMaskSet_mcbm2025.yaml"; sts.chanMask = "mcbm2025_02/StsChannelMaskSet_mcbm2025.yaml";
......
...@@ -57,10 +57,14 @@ namespace cbm ...@@ -57,10 +57,14 @@ namespace cbm
/// 2024/03 Gold runs /// 2024/03 Gold runs
sSetupName = "mcbm_beam_2024_03_22_gold"; 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 /// Dummy needed to run the unpack macro until we have a setup ready
sSetupName = "mcbm_beam_2024_05_08_nickel"; 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 { else {
/// Missing runs, exception there to force implementation and support from users side /// 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))); throw(std::invalid_argument(Form("RunId %d is not mapped! Please complete the map!", ulRunId)));
......
...@@ -145,6 +145,10 @@ void CbmOnlineParWrite::AddTof() ...@@ -145,6 +145,10 @@ void CbmOnlineParWrite::AddTof()
doCalibration = true; doCalibration = true;
cFname = Form("%s/3026_1_TofCal.hst.root", TofFileFolder.Data()); cFname = Form("%s/3026_1_TofCal.hst.root", TofFileFolder.Data());
break; 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"); default: throw std::runtime_error("TOF: Unknown setup type");
} }
...@@ -247,7 +251,7 @@ void CbmOnlineParWrite::AddSts() ...@@ -247,7 +251,7 @@ void CbmOnlineParWrite::AddSts()
sensorParSet->SetParSensor(stsAddress10, sensor6cm); sensorParSet->SetParSensor(stsAddress10, sensor6cm);
sensorParSet->SetParSensor(stsAddress11, 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 addr01 = 0x10008012;
uint32_t addr02 = 0x10018012; uint32_t addr02 = 0x10018012;
uint32_t addr03 = 0x10008412; uint32_t addr03 = 0x10008412;
...@@ -336,6 +340,7 @@ void CbmOnlineParWrite::Run(const Config& config) ...@@ -336,6 +340,7 @@ void CbmOnlineParWrite::Run(const Config& config)
case Setup::mCBM2022: runId = 2391; break; case Setup::mCBM2022: runId = 2391; break;
case Setup::mCBM2024_03: runId = 2724; break; case Setup::mCBM2024_03: runId = 2724; break;
case Setup::mCBM2024_05: runId = 2918; break; case Setup::mCBM2024_05: runId = 2918; break;
case Setup::mCBM2025_02: runId = 3453; break;
default: throw std::runtime_error("Unknown setup type"); default: throw std::runtime_error("Unknown setup type");
} }
geoSetupTag = cbm::mcbm::GetSetupFromRunId(runId); geoSetupTag = cbm::mcbm::GetSetupFromRunId(runId);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment