From ad6c9ccb15a7118e0a354827e54fdf041dc6f745 Mon Sep 17 00:00:00 2001
From: Alexandru Bercuci <abercuci@niham.nipne.ro>
Date: Sat, 15 Feb 2025 05:35:52 +0200
Subject: [PATCH] fix Mac build error
---
algo/detectors/trd2d/ReadoutConfig.cxx | 5 ++---
algo/detectors/trd2d/ReadoutConfig.h | 2 +-
reco/tasks/CbmTaskTrdUnpackParWrite.cxx | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/algo/detectors/trd2d/ReadoutConfig.cxx b/algo/detectors/trd2d/ReadoutConfig.cxx
index 7d3dc97ef..faeb1cb9c 100644
--- a/algo/detectors/trd2d/ReadoutConfig.cxx
+++ b/algo/detectors/trd2d/ReadoutConfig.cxx
@@ -119,8 +119,7 @@ namespace cbm::algo::trd2d
// --- Initialise the mapping structure --------------------------------------------
void ReadoutSetup::InitChannelMap(
- const std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, uint8_t, uint16_t>>>>&
- channelMap)
+ const std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, int8_t, uint16_t>>>>& channelMap)
{
// Constructing the map (equipId, asicId, chanId) -> (pad address, mask flag, daq offset)
for (auto compMap : channelMap) {
@@ -132,7 +131,7 @@ namespace cbm::algo::trd2d
fChannelMap[equipmentId][asicId].resize(16);
for (auto chanMap : asicMap.second) {
uint16_t chanId = chanMap.first;
- std::tuple<int32_t, bool, uint8_t, uint16_t> chanPars = chanMap.second;
+ std::tuple<int32_t, bool, int8_t, uint16_t> chanPars = chanMap.second;
const ChanMapping entry = {std::get<0>(chanPars), std::get<1>(chanPars), std::get<2>(chanPars),
std::get<3>(chanPars)};
fChannelMap[equipmentId][asicId][chanId] = entry;
diff --git a/algo/detectors/trd2d/ReadoutConfig.h b/algo/detectors/trd2d/ReadoutConfig.h
index 473a662f9..fe590915b 100644
--- a/algo/detectors/trd2d/ReadoutConfig.h
+++ b/algo/detectors/trd2d/ReadoutConfig.h
@@ -116,7 +116,7 @@ namespace cbm::algo::trd2d
/** @brief Initialisation of channel map **/
void InitChannelMap(
- const std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, uint8_t, uint16_t>>>>&
+ const std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, int8_t, uint16_t>>>>&
channelMap);
/** @brief Get system time offset **/
diff --git a/reco/tasks/CbmTaskTrdUnpackParWrite.cxx b/reco/tasks/CbmTaskTrdUnpackParWrite.cxx
index 078d7f32b..92e14baf5 100644
--- a/reco/tasks/CbmTaskTrdUnpackParWrite.cxx
+++ b/reco/tasks/CbmTaskTrdUnpackParWrite.cxx
@@ -39,7 +39,7 @@ InitStatus CbmTaskTrdUnpackParWrite::Init()
// Map (moduleId) -> (array of crobId)
std::map<uint32_t, std::vector<uint16_t>> crobMap;
// Map (equipId, asicId, chanId) -> (pad address, mask flag, daq offset [FASP clk])
- std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, uint8_t, uint16_t>>>> channelMap;
+ std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, int8_t, uint16_t>>>> channelMap;
// Loop through a list of module IDs from the .digi file (can in principle contradict crob_map).
for (auto entry : digiparset.GetModuleMap()) {
--
GitLab