Skip to content
Snippets Groups Projects
Commit ad6c9ccb authored by Alexandru Bercuci's avatar Alexandru Bercuci
Browse files

fix Mac build error

parent 5183d89f
No related branches found
No related tags found
1 merge request!2028Trd2d online - finner time calibration
...@@ -119,8 +119,7 @@ namespace cbm::algo::trd2d ...@@ -119,8 +119,7 @@ namespace cbm::algo::trd2d
// --- Initialise the mapping structure -------------------------------------------- // --- Initialise the mapping structure --------------------------------------------
void ReadoutSetup::InitChannelMap( 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>>>>& const std::map<size_t, std::map<size_t, std::map<size_t, std::tuple<int32_t, bool, int8_t, uint16_t>>>>& channelMap)
channelMap)
{ {
// Constructing the map (equipId, asicId, chanId) -> (pad address, mask flag, daq offset) // Constructing the map (equipId, asicId, chanId) -> (pad address, mask flag, daq offset)
for (auto compMap : channelMap) { for (auto compMap : channelMap) {
...@@ -132,7 +131,7 @@ namespace cbm::algo::trd2d ...@@ -132,7 +131,7 @@ namespace cbm::algo::trd2d
fChannelMap[equipmentId][asicId].resize(16); fChannelMap[equipmentId][asicId].resize(16);
for (auto chanMap : asicMap.second) { for (auto chanMap : asicMap.second) {
uint16_t chanId = chanMap.first; 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), const ChanMapping entry = {std::get<0>(chanPars), std::get<1>(chanPars), std::get<2>(chanPars),
std::get<3>(chanPars)}; std::get<3>(chanPars)};
fChannelMap[equipmentId][asicId][chanId] = entry; fChannelMap[equipmentId][asicId][chanId] = entry;
......
...@@ -116,7 +116,7 @@ namespace cbm::algo::trd2d ...@@ -116,7 +116,7 @@ namespace cbm::algo::trd2d
/** @brief Initialisation of channel map **/ /** @brief Initialisation of channel map **/
void InitChannelMap( 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); channelMap);
/** @brief Get system time offset **/ /** @brief Get system time offset **/
......
...@@ -39,7 +39,7 @@ InitStatus CbmTaskTrdUnpackParWrite::Init() ...@@ -39,7 +39,7 @@ InitStatus CbmTaskTrdUnpackParWrite::Init()
// Map (moduleId) -> (array of crobId) // Map (moduleId) -> (array of crobId)
std::map<uint32_t, std::vector<uint16_t>> crobMap; std::map<uint32_t, std::vector<uint16_t>> crobMap;
// Map (equipId, asicId, chanId) -> (pad address, mask flag, daq offset [FASP clk]) // 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). // Loop through a list of module IDs from the .digi file (can in principle contradict crob_map).
for (auto entry : digiparset.GetModuleMap()) { for (auto entry : digiparset.GetModuleMap()) {
......
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