From 10ca40eaa7541b0df4db8a12e28bb34da17766a0 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Tue, 19 Nov 2024 11:13:45 +0100
Subject: [PATCH] Unify name of time offset getters in online BMon/STS/TOF
unpackers w/ TRD ones
---
algo/detectors/bmon/ReadoutConfig.cxx | 2 +-
algo/detectors/bmon/ReadoutConfig.h | 4 ++--
algo/detectors/bmon/Unpack.cxx | 4 ++--
algo/detectors/sts/Unpack.cxx | 2 +-
algo/detectors/sts/WalkMap.h | 2 +-
algo/detectors/tof/ReadoutConfig.cxx | 2 +-
algo/detectors/tof/ReadoutConfig.h | 4 ++--
algo/detectors/tof/Unpack.cxx | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/algo/detectors/bmon/ReadoutConfig.cxx b/algo/detectors/bmon/ReadoutConfig.cxx
index ab27178e17..60b22300d3 100644
--- a/algo/detectors/bmon/ReadoutConfig.cxx
+++ b/algo/detectors/bmon/ReadoutConfig.cxx
@@ -63,7 +63,7 @@ namespace cbm::algo::bmon
// --- Mapping (equimentId, elink) -> time offset -------------------------------------
- int32_t ReadoutConfig::TimeOffsetMap(uint16_t equipmentId, uint16_t elinkId)
+ int32_t ReadoutConfig::GetElinkTimeOffset(uint16_t equipmentId, uint16_t elinkId)
{
int32_t result = 0;
auto equipIter = fTimeOffsetMap.find(equipmentId);
diff --git a/algo/detectors/bmon/ReadoutConfig.h b/algo/detectors/bmon/ReadoutConfig.h
index a16d72aa61..6b1fa6e2a5 100644
--- a/algo/detectors/bmon/ReadoutConfig.h
+++ b/algo/detectors/bmon/ReadoutConfig.h
@@ -79,7 +79,7 @@ namespace cbm::algo::bmon
/** @brief System time offset for BMon
** @return Value of system time offset
**/
- i32 TimeOffset() const { return fTimeOffset; }
+ i32 GetSystemTimeOffset() const { return fTimeOffset; }
/** @brief Equipment in the configuration
** @return Vector of equipment IDs
@@ -104,7 +104,7 @@ namespace cbm::algo::bmon
** @param elink Elink number within component
** @return Time Offset
*/
- int32_t TimeOffsetMap(uint16_t equipId, uint16_t elink);
+ int32_t GetElinkTimeOffset(uint16_t equipId, uint16_t elink);
private:
// --- BMon system time offset
diff --git a/algo/detectors/bmon/Unpack.cxx b/algo/detectors/bmon/Unpack.cxx
index 60935649c8..f7eaae2d5b 100644
--- a/algo/detectors/bmon/Unpack.cxx
+++ b/algo/detectors/bmon/Unpack.cxx
@@ -12,7 +12,7 @@ using fles::Subsystem;
Unpack::Unpack(const ReadoutConfig& readout) : fReadout(readout)
{
constexpr u8 SystemVersion = 0x00;
- i32 SysTimeOffset = fReadout.TimeOffset();
+ i32 SysTimeOffset = fReadout.GetSystemTimeOffset();
// Create one algorithm per component for Bmon and configure it with parameters
auto equipIdsBmon = fReadout.GetEquipmentIds();
@@ -22,7 +22,7 @@ Unpack::Unpack(const ReadoutConfig& readout) : fReadout(readout)
for (size_t elink = 0; elink < numElinks; elink++) {
bmon::UnpackElinkPar elinkPar;
elinkPar.fChannelUId = fReadout.Map(equip, elink); // Vector of Bmon addresses for this elink
- elinkPar.fTimeOffset = SysTimeOffset + fReadout.TimeOffsetMap(equip, elink); // Time offset for this elink
+ elinkPar.fTimeOffset = SysTimeOffset + fReadout.GetElinkTimeOffset(equip, elink); // Time offset for this elink
par.fElinkParams.push_back(elinkPar);
}
auto algo = std::make_unique<UnpackMS>(par);
diff --git a/algo/detectors/sts/Unpack.cxx b/algo/detectors/sts/Unpack.cxx
index d224f0d4f0..e1ddecff19 100644
--- a/algo/detectors/sts/Unpack.cxx
+++ b/algo/detectors/sts/Unpack.cxx
@@ -28,7 +28,7 @@ Unpack::Unpack(const Config& config) : fConfig(config)
auto mapEntry = fConfig.readout.Map(equip, elink);
elinkPar.fAddress = mapEntry.moduleAddress; // Module address for this elink
elinkPar.fAsicNr = mapEntry.asicNumber; // ASIC number within module
- elinkPar.fTimeOffset = fConfig.walkMap.TimeOffset();
+ elinkPar.fTimeOffset = fConfig.walkMap.GetSystemTimeOffset();
elinkPar.fAdcMinCut = fConfig.readout.AdcCutMap(equip, elink);
elinkPar.fAdcOffset = 1.;
elinkPar.fAdcGain = 1.;
diff --git a/algo/detectors/sts/WalkMap.h b/algo/detectors/sts/WalkMap.h
index 537d8bd6f9..57a23d54a0 100644
--- a/algo/detectors/sts/WalkMap.h
+++ b/algo/detectors/sts/WalkMap.h
@@ -31,7 +31,7 @@ namespace cbm::algo::sts
std::vector<double> Get(int32_t modAddress, uint16_t asic);
/** @brief Get system time offset. **/
- i32 TimeOffset() { return timeOffset; }
+ i32 GetSystemTimeOffset() { return timeOffset; }
private:
// Move ADC into seperate class for easier YAML formatting
diff --git a/algo/detectors/tof/ReadoutConfig.cxx b/algo/detectors/tof/ReadoutConfig.cxx
index 017839f3f3..5541c13cfc 100644
--- a/algo/detectors/tof/ReadoutConfig.cxx
+++ b/algo/detectors/tof/ReadoutConfig.cxx
@@ -64,7 +64,7 @@ namespace cbm::algo::tof
// --- Mapping (equimentId, elink) -> time offset -------------------------------------
- int32_t ReadoutConfig::TimeOffsetMap(uint16_t equipmentId, uint16_t elinkId)
+ int32_t ReadoutConfig::GetElinkTimeOffset(uint16_t equipmentId, uint16_t elinkId)
{
int32_t result = 0;
auto equipIter = fTimeOffsetMap.find(equipmentId);
diff --git a/algo/detectors/tof/ReadoutConfig.h b/algo/detectors/tof/ReadoutConfig.h
index a4f74121b8..18bd409fea 100644
--- a/algo/detectors/tof/ReadoutConfig.h
+++ b/algo/detectors/tof/ReadoutConfig.h
@@ -87,7 +87,7 @@ namespace cbm::algo::tof
/** @brief System time offset for TOF
** @return Value of system time offset
**/
- i32 TimeOffset() const { return fTimeOffset; }
+ i32 GetSystemTimeOffset() const { return fTimeOffset; }
/** @brief Equipment in the configuration
** @return Vector of equipment IDs
@@ -112,7 +112,7 @@ namespace cbm::algo::tof
** @param elink Elink number within component
** @return Time Offset
*/
- int32_t TimeOffsetMap(uint16_t equipId, uint16_t elink);
+ int32_t GetElinkTimeOffset(uint16_t equipId, uint16_t elink);
private:
// --- BMon system time offset
diff --git a/algo/detectors/tof/Unpack.cxx b/algo/detectors/tof/Unpack.cxx
index 2c95397abd..2409c772a2 100644
--- a/algo/detectors/tof/Unpack.cxx
+++ b/algo/detectors/tof/Unpack.cxx
@@ -12,7 +12,7 @@ using fles::Subsystem;
Unpack::Unpack(const ReadoutConfig& readout) : fReadout(readout)
{
constexpr u8 SystemVersion = 0x00;
- i32 SysTimeOffset = fReadout.TimeOffset();
+ i32 SysTimeOffset = fReadout.GetSystemTimeOffset();
auto equipIdsTof = fReadout.GetEquipmentIds();
for (auto& equip : equipIdsTof) {
@@ -21,7 +21,7 @@ Unpack::Unpack(const ReadoutConfig& readout) : fReadout(readout)
for (size_t elink = 0; elink < numElinks; elink++) {
tof::UnpackElinkPar elinkPar;
elinkPar.fChannelUId = fReadout.Map(equip, elink); // Vector of TOF addresses for this elink
- elinkPar.fTimeOffset = SysTimeOffset + fReadout.TimeOffsetMap(equip, elink); // Time offset for this elink
+ elinkPar.fTimeOffset = SysTimeOffset + fReadout.GetElinkTimeOffset(equip, elink); // Time offset for this elink
par.fElinkParams.push_back(elinkPar);
}
auto algo = std::make_unique<UnpackMS>(std::move(par));
--
GitLab