Skip to content
Snippets Groups Projects
Commit ed8c09ef authored by Jan de Cuveland's avatar Jan de Cuveland
Browse files

Rename T0 detector to BMON

parent cf1b36c8
No related branches found
No related tags found
No related merge requests found
Pipeline #23114 failed
...@@ -40,7 +40,7 @@ CBM_ENUM_DICT(fles::Subsystem, ...@@ -40,7 +40,7 @@ CBM_ENUM_DICT(fles::Subsystem,
// Other detectors (experimental) // Other detectors (experimental)
{"ECAL", fles::Subsystem::ECAL}, {"ECAL", fles::Subsystem::ECAL},
{"PSD", fles::Subsystem::PSD}, {"PSD", fles::Subsystem::PSD},
{"T0", fles::Subsystem::T0}, {"BMON", fles::Subsystem::BMON},
{"TRB3", fles::Subsystem::TRB3}, {"TRB3", fles::Subsystem::TRB3},
{"Hodoscope", fles::Subsystem::Hodoscope}, {"Hodoscope", fles::Subsystem::Hodoscope},
{"Cherenkov", fles::Subsystem::Cherenkov}, {"Cherenkov", fles::Subsystem::Cherenkov},
......
...@@ -63,7 +63,7 @@ namespace cbm::algo ...@@ -63,7 +63,7 @@ namespace cbm::algo
// if (subsystem == Subsystem::TOF) { // if (subsystem == Subsystem::TOF) {
// MsLoop(timeslice, fAlgoTof, comp, equipmentId, &digiTs.fData.fTof.fDigis, monitor, &monitor.fTof, 0x00); // MsLoop(timeslice, fAlgoTof, comp, equipmentId, &digiTs.fData.fTof.fDigis, monitor, &monitor.fTof, 0x00);
// } // }
if (subsystem == Subsystem::T0) { if (subsystem == Subsystem::BMON) {
MsLoop(timeslice, fAlgoBmon, comp, equipmentId, &digiTs.fData.fT0.fDigis, monitor, &monitor.fBmon, 0x00); MsLoop(timeslice, fAlgoBmon, comp, equipmentId, &digiTs.fData.fT0.fDigis, monitor, &monitor.fBmon, 0x00);
} }
if (subsystem == Subsystem::TRD) { if (subsystem == Subsystem::TRD) {
...@@ -298,7 +298,7 @@ namespace cbm::algo ...@@ -298,7 +298,7 @@ namespace cbm::algo
for (size_t elink = 0; elink < numElinks; elink++) { for (size_t elink = 0; elink < numElinks; elink++) {
UnpackBmonElinkPar elinkPar; UnpackBmonElinkPar elinkPar;
elinkPar.fChannelUId = fBmonConfig.Map(equip, elink); // Vector of T0 addresses for this elink elinkPar.fChannelUId = fBmonConfig.Map(equip, elink); // Vector of T0 addresses for this elink
elinkPar.fTimeOffset = fSystemTimeOffset[Subsystem::T0]; elinkPar.fTimeOffset = fSystemTimeOffset[Subsystem::BMON];
par->fElinkParams.push_back(elinkPar); par->fElinkParams.push_back(elinkPar);
} }
fAlgoBmon[equip].SetParams(std::move(par)); fAlgoBmon[equip].SetParams(std::move(par));
......
...@@ -120,7 +120,7 @@ namespace cbm::algo ...@@ -120,7 +120,7 @@ namespace cbm::algo
Subsystem::STS, Subsystem::STS,
Subsystem::MUCH, Subsystem::MUCH,
Subsystem::TOF, Subsystem::TOF,
Subsystem::T0, Subsystem::BMON,
Subsystem::TRD, Subsystem::TRD,
Subsystem::TRD2D, Subsystem::TRD2D,
Subsystem::RICH, Subsystem::RICH,
...@@ -180,7 +180,7 @@ namespace cbm::algo ...@@ -180,7 +180,7 @@ namespace cbm::algo
/** @brief System time offsets **/ /** @brief System time offsets **/
std::map<Subsystem, int32_t> fSystemTimeOffset = { std::map<Subsystem, int32_t> fSystemTimeOffset = {
{Subsystem::STS, -970}, {Subsystem::MUCH, -980}, {Subsystem::RICH, 100}, {Subsystem::TOF, 40}, {Subsystem::STS, -970}, {Subsystem::MUCH, -980}, {Subsystem::RICH, 100}, {Subsystem::TOF, 40},
{Subsystem::T0, 0}, {Subsystem::TRD, 1300}, {Subsystem::TRD2D, -510}}; {Subsystem::BMON, 0}, {Subsystem::TRD, 1300}, {Subsystem::TRD2D, -510}};
}; };
} // namespace cbm::algo } // namespace cbm::algo
......
...@@ -12,7 +12,7 @@ void UnpackChain::Init() ...@@ -12,7 +12,7 @@ void UnpackChain::Init()
fUnpack.Init(std::vector<fles::Subsystem> { fUnpack.Init(std::vector<fles::Subsystem> {
fles::Subsystem::STS, fles::Subsystem::STS,
// fles::Subsystem::MUCH, // fles::Subsystem::MUCH,
fles::Subsystem::TOF, fles::Subsystem::T0, fles::Subsystem::TOF, fles::Subsystem::BMON,
// fles::Subsystem::TRD, // fles::Subsystem::TRD,
// fles::Subsystem::TRD2D, // fles::Subsystem::TRD2D,
}); });
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# The included libraries provide the interface to the experiment data in timeslices # The included libraries provide the interface to the experiment data in timeslices
# both online and in timeslice archive (.tsa) files. # both online and in timeslice archive (.tsa) files.
set(FLESNET_VERSION 7d8bb6819671e9718da8cce052d9c070fe0c9cfc) # 2023-07-04 set(FLESNET_VERSION 8a8b7cefd37b18cfd15a3c0c812ff652217e994e) # 2023-07-06
set(FLESNET_SRC_URL "https://github.com/cbm-fles/flesnet") set(FLESNET_SRC_URL "https://github.com/cbm-fles/flesnet")
......
...@@ -197,7 +197,7 @@ Bool_t CbmRecoUnpack::Init() ...@@ -197,7 +197,7 @@ Bool_t CbmRecoUnpack::Init()
fBmonConfig->LoadParFileName(); /// Needed to change the Parameter file name before it is used!!! fBmonConfig->LoadParFileName(); /// Needed to change the Parameter file name before it is used!!!
initParContainers(fBmonConfig->GetParContainerRequest()); /// Framework bound work = kept in this Task initParContainers(fBmonConfig->GetParContainerRequest()); /// Framework bound work = kept in this Task
fBmonConfig->InitAlgo(); fBmonConfig->InitAlgo();
initPerformanceMaps(Subsystem::T0, "Bmon"); initPerformanceMaps(Subsystem::BMON, "Bmon");
} }
if (fDoPerfProfPerTs) { if (fDoPerfProfPerTs) {
...@@ -549,7 +549,7 @@ void CbmRecoUnpack::Unpack(unique_ptr<Timeslice> ts) ...@@ -549,7 +549,7 @@ void CbmRecoUnpack::Unpack(unique_ptr<Timeslice> ts)
} }
break; break;
} }
case Subsystem::T0: { case Subsystem::BMON: {
if (fBmonConfig) { if (fBmonConfig) {
fCbmTsEventHeader->AddNDigisBmon(unpack(subsystem, &timeslice, component, fBmonConfig, fCbmTsEventHeader->AddNDigisBmon(unpack(subsystem, &timeslice, component, fBmonConfig,
fBmonConfig->GetOptOutAVec(), fBmonConfig->GetOptOutBVec())); fBmonConfig->GetOptOutAVec(), fBmonConfig->GetOptOutBVec()));
......
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