Skip to content
Snippets Groups Projects
Commit 56d7c5ad authored by Dominik Smith's avatar Dominik Smith Committed by Pierre-Alain Loizeau
Browse files

Unpack Much: Applied Epoch cycle fix. Fixed MacOS compilation (variable-sized...

Unpack Much: Applied Epoch cycle fix. Fixed MacOS compilation (variable-sized array). Fixed missing Elink parameters.
parent 059dd3d5
No related branches found
No related tags found
1 merge request!866Much Unpacker in Algo namespace
......@@ -61,9 +61,9 @@ namespace cbm::algo
static const uint16_t numFebsPerCrob = 9; // Number of FEBs connected to each CROB for mMuch 2019
static const uint16_t numAsicsPerFeb = 1; // Number of ASICs connected in each FEB for MUCH
static const uint16_t numChanPerAsic = 128; // Number of channels in each ASIC
static const uint16_t numComp = 6; // Total number of MUCH DPBs in system
/// Variables
uint16_t numComp = 6; // Total number of MUCH DPBs in system
uint16_t numFebsInGemA = 27; // Number of FEBs connected in GEM Module A
uint16_t numFebsInGemB = 18; // Number of FEBs connected in GEM Module B
uint16_t numFebsInRpc = 9; // Number of FEBs connected in RPC Module
......
......@@ -34,6 +34,8 @@ namespace cbm::algo
// --- Current TS_MSB epoch cycle
auto const msTime = msDescr.idx; // Unix time of MS in ns
fCurrentCycle = std::ldiv(msTime, fkCycleLength).quot;
fCurrentEpoch = 0; // Needed to make each MS independent of the previous! Will be updated in message 1 if MS OK
fCurrentEpochTime = 0; // Needed to make each MS independent of the previous! Will be updated in message 1 if MS OK
// --- Number of messages in microslice
auto msSize = msDescr.size;
......
......@@ -280,6 +280,7 @@ InitStatus CbmTaskUnpack::Init()
UnpackMuchElinkPar elinkPar;
elinkPar.fAddress = fMuchConfig.Map(equip, elink); // Vector of MUCH addresses for this elink
elinkPar.fTimeOffset = 0.;
par->fElinkParams.push_back(elinkPar);
}
fAlgoMuch[equip].SetParams(std::move(par));
LOG(info) << "--- Configured equipment " << equip << " with " << numElinks << " elinks";
......
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