Skip to content
Snippets Groups Projects

Moved STS system time offset parameter from sts::ReadoutConfig to sts::WalkMap.

Merged Dominik Smith requested to merge d.smith/cbmroot:StsTimeOffsetMove into master
5 files
+ 17
18
Compare changes
  • Side-by-side
  • Inline

Files

@@ -86,8 +86,6 @@ void sts::ReadoutConfig::Init(const ReadoutSetup& config, const ChannelMaskSet&
const uint16_t numChanPerAsic = 128; ///< Number of channels per ASIC
const uint16_t numElinksPerComp = numCrobPerComp * numElinksPerCrob;
fTimeOffset = config.timeOffset;
// Constructing the map (equipmentId, eLink) -> (module, ASIC within module)
int32_t febBaseIdx = 0;
for (uint16_t compIdx = 0; compIdx < numComp; compIdx++) {
@@ -102,7 +100,7 @@ void sts::ReadoutConfig::Init(const ReadoutSetup& config, const ChannelMaskSet&
uint16_t asicInModule = 0;
bool isPulser = false;
uint16_t elinkId = numElinksPerCrob * crobIdx + elinkIdx; // elink within component
uint16_t elinkId = numElinksPerCrob * crobIdx + elinkIdx; // elink within component
const auto& elinks = config.GetElinks(component.GetFEBType());
const auto& elink = elinks.at(elinkId);
@@ -132,8 +130,8 @@ void sts::ReadoutConfig::Init(const ReadoutSetup& config, const ChannelMaskSet&
asicInModule = (moduleSide == 1 ? asicInFeb : numAsicsPerMod - 1 - asicInFeb);
// Init channel mask
const int32_t febId = feb + febBaseIdx;
auto mapIt = chanMaskSet.values.find(febId);
const int32_t febId = feb + febBaseIdx;
auto mapIt = chanMaskSet.values.find(febId);
if (mapIt != chanMaskSet.values.end()) {
const auto& mask = mapIt->second;
@@ -151,10 +149,10 @@ void sts::ReadoutConfig::Init(const ReadoutSetup& config, const ChannelMaskSet&
fReadoutConfig[equipment][elinkIdx] = {moduleAddress, asicInModule, isPulser};
} //# elink
} //# CROB
} //# elink
} //# CROB
febBaseIdx += numCrobPerComp * numFebsPerCrob; // Add the proper offset for the current CROB
} //# component
} //# component
}
sts::ReadoutConfig::Entry sts::ReadoutConfig::Map(uint16_t equipmentId, uint16_t elinkId)
Loading