Skip to content

Commit b23f163

Browse files
martenolemartenole
authored
TRD enable CCDB link mapping (#9776)
- Fix some minor compiler warnings - Improve error message handling - Fix option to parse only calibration triggers
1 parent 6d5f5d7 commit b23f163

12 files changed

Lines changed: 100 additions & 93 deletions

File tree

‎DataFormats/Detectors/TRD/include/DataFormatsTRD/RawData.h‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -435,16 +435,6 @@ uint32_t getlinkerrorflag(const HalfCRUHeader& cruhead, const uint32_t link);
435435
uint32_t getlinkdatasize(const HalfCRUHeader& cruhead, const uint32_t link);
436436
uint32_t getlinkerrorflags(const HalfCRUHeader& cruheader, std::array<uint32_t, 15>& linkerrorflags);
437437
uint32_t getlinkdatasizes(const HalfCRUHeader& cruheader, std::array<uint32_t, 15>& linksizes);
438-
std::ostream& operator<<(std::ostream& stream, const TrackletHCHeader& halfchamberheader);
439-
std::ostream& operator<<(std::ostream& stream, const TrackletMCMHeader& mcmhead);
440-
std::ostream& operator<<(std::ostream& stream, const TrackletMCMData& tracklet);
441-
void dumpHalfChamber(o2::trd::TrackletHCHeader& halfchamber);
442-
std::ostream& operator<<(std::ostream& stream, const HalfCRUHeader& halfcru);
443-
bool trackletMCMHeaderSanityCheck(o2::trd::TrackletMCMHeader& header);
444-
bool trackletHCHeaderSanityCheck(o2::trd::TrackletHCHeader& header);
445-
bool digitMCMHeaderSanityCheck(o2::trd::DigitMCMHeader* header);
446-
bool digitMCMADCMaskSanityCheck(o2::trd::DigitMCMADCMask& mask, int numberofbitsset);
447-
bool digitMCMWordSanityCheck(o2::trd::DigitMCMData* word, int adcchannel);
448438
bool halfCRUHeaderSanityCheck(const o2::trd::HalfCRUHeader& header);
449439
void printDigitHCHeader(o2::trd::DigitHCHeader& header, uint32_t headers[3]);
450440

@@ -480,6 +470,7 @@ void printDigitMCMADCMask(const o2::trd::DigitMCMADCMask& digitmcmadcmask);
480470

481471
void printHalfCRUHeader(const o2::trd::HalfCRUHeader& halfcru);
482472
void clearHalfCRUHeader(o2::trd::HalfCRUHeader& halfcru);
473+
bool sanityCheckTrackletHCHeader(const o2::trd::TrackletHCHeader& header);
483474
bool sanityCheckTrackletMCMHeader(const o2::trd::TrackletMCMHeader& header);
484475
bool sanityCheckDigitMCMHeader(const o2::trd::DigitMCMHeader& header);
485476
bool sanityCheckDigitMCMADCMask(const o2::trd::DigitMCMADCMask& mask);

‎DataFormats/Detectors/TRD/include/DataFormatsTRD/RawDataStats.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ enum ParsingErrors {
4444
TrackletDataWrongOrdering, // the tracklet data is not arriving in increasing MCM order
4545
TrackletDataDuplicateMCM, // we see more than one TrackletMCMHeader for the same MCM
4646
TrackletNoTrackletEndMarker, // got to the end of the buffer with out finding a tracklet end marker.
47+
TrackletNoSecondEndMarker, // we expected to see a second tracklet end marker, but found something else instead
48+
TrackletMCMDataFailure, // invalid word for TrackletMCMData detected
49+
TrackletDataMissing, // we expected tracklet data but got an endmarker instead
4750
TrackletExitingNoTrackletEndMarker, // got to the end of the buffer exiting tracklet parsing with no tracklet end marker
4851
UnparsedTrackletDataRemaining, // the tracklet parsing has finished correctly, but there is still data left on the link (CRU puts incorrect link size or corrupt data?)
4952
UnparsedDigitDataRemaining, // the digit parsing has finished correctly, but there is still data left on the link (CRU puts incorrect link size or corrupt data? RDH > 8kByte before?)
@@ -84,6 +87,9 @@ static const std::unordered_map<int, std::string> ParsingErrorsString = {
8487
{TrackletDataWrongOrdering, "TrackletDataWrongOrdering"},
8588
{TrackletDataDuplicateMCM, "TrackletDataDuplicateMCM"},
8689
{TrackletNoTrackletEndMarker, "TrackletNoTrackletEndMarker"},
90+
{TrackletNoSecondEndMarker, "TrackletNoSecondEndMarker"},
91+
{TrackletMCMDataFailure, "TrackletMCMDataFailure"},
92+
{TrackletDataMissing, "TrackletDataMissing"},
8793
{TrackletExitingNoTrackletEndMarker, "TrackletExitingNoTrackletEndMarker"},
8894
{UnparsedTrackletDataRemaining, "UnparsedTrackletDataRemaining"},
8995
{UnparsedDigitDataRemaining, "UnparsedDigitDataRemaining"},

‎DataFormats/Detectors/TRD/src/RawData.cxx‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,23 @@ bool halfCRUHeaderSanityCheck(const o2::trd::HalfCRUHeader& header)
266266
return true;
267267
}
268268

269+
bool sanityCheckTrackletHCHeader(const o2::trd::TrackletHCHeader& header)
270+
{
271+
if (header.one != 1) {
272+
return false;
273+
}
274+
if (((~header.supermodule) & 0x1f) >= NSECTOR) {
275+
return false;
276+
}
277+
if (((~header.stack) & 0x7) >= NSTACK) {
278+
return false;
279+
}
280+
if (((~header.layer) & 0x7) >= NLAYER) {
281+
return false;
282+
}
283+
return true;
284+
}
285+
269286
bool sanityCheckTrackletMCMHeader(const o2::trd::TrackletMCMHeader& header)
270287
{
271288
// a bit limited to what we can check.
@@ -298,7 +315,7 @@ bool sanityCheckDigitMCMADCMask(const o2::trd::DigitMCMADCMask& mask)
298315
if (mask.j != 0xc) {
299316
return false;
300317
}
301-
int counter = (~mask.c) & 0x1f;
318+
unsigned int counter = (~mask.c) & 0x1f;
302319
std::bitset<NADCMCM> headerMask(mask.adcmask);
303320
return (counter == headerMask.count());
304321
}
@@ -376,7 +393,6 @@ void printDigitHCHeaders(o2::trd::DigitHCHeader& header, uint32_t headers[3], in
376393
void printDigitHCHeader(o2::trd::DigitHCHeader& header, uint32_t headers[3])
377394
{
378395
printDigitHCHeaders(header, headers, -1, 0, true);
379-
int countheaderwords = header.numberHCW;
380396
int index;
381397
//for the currently 3 implemented other header words, they can come in any order, and are identified by their reserved portion
382398
for (int countheaderwords = 0; countheaderwords < header.numberHCW; ++countheaderwords) {

‎Detectors/TRD/reconstruction/include/TRDReconstruction/CruRawReader.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ class CruRawReader
160160

161161
HalfCRUHeader mCurrentHalfCRUHeader; // are we waiting for new header or currently parsing the payload of on
162162
HalfCRUHeader mPreviousHalfCRUHeader; // are we waiting for new header or currently parsing the payload of on
163+
bool mPreviousHalfCRUHeaderSet; // flag, whether we can use mPreviousHalfCRUHeader for additional sanity checks
163164
DigitHCHeader mDigitHCHeader; // Digit HalfChamber header we are currently on.
164165
uint16_t mTimeBins{constants::TIMEBINS}; // the number of time bins to be read out (default 30, can be overwritten from digit HC header)
165166
bool mHaveSeenDigitHCHeader3{false}; // flag, whether we can compare an incoming DigitHCHeader3 with a header we have seen before

‎Detectors/TRD/reconstruction/macros/CompareDigitsAndTracklets.C‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,20 @@ void CompareDigitsAndTracklets(bool ignoreTrkltPid = false,
7878
trackletTreereco->GetEvent(iev);
7979

8080
// compare trigger records
81+
bool compareTriggerRecords = true;
8182
if (trigRecs->size() != trigRecsReco->size()) {
8283
LOG(warn) << "Number of trigger records does not match for entry " << iev;
83-
continue;
84+
compareTriggerRecords = false;
8485
}
85-
for (size_t iTrig = 0; iTrig < trigRecs->size(); ++iTrig) {
86-
const auto& trig = trigRecs->at(iTrig);
87-
const auto& trigReco = trigRecsReco->at(iTrig);
88-
if (!(trig == trigReco)) {
89-
LOGF(error, "Trigger records don't match at trigger %lu. Reference orbit/bc (%u/%u), orbit/bc (%u/%u)",
90-
iTrig, trig.getBCData().orbit, trig.getBCData().bc, trigReco.getBCData().orbit, trigReco.getBCData().bc);
91-
break;
86+
if (compareTriggerRecords) {
87+
for (size_t iTrig = 0; iTrig < trigRecs->size(); ++iTrig) {
88+
const auto& trig = trigRecs->at(iTrig);
89+
const auto& trigReco = trigRecsReco->at(iTrig);
90+
if (!(trig == trigReco)) {
91+
LOGF(error, "Trigger records don't match at trigger %lu. Reference orbit/bc (%u/%u), orbit/bc (%u/%u)",
92+
iTrig, trig.getBCData().orbit, trig.getBCData().bc, trigReco.getBCData().orbit, trigReco.getBCData().bc);
93+
break;
94+
}
9295
}
9396
}
9497

‎Detectors/TRD/reconstruction/src/CruRawReader.cxx‎

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ int CruRawReader::processHBFs()
203203
// at this point the entire HBF data payload is sitting in mHBFPayload and the total data count is mTotalHBFPayLoad
204204
int iteration = 0;
205205
mHBFoffset32 = 0;
206+
mPreviousHalfCRUHeaderSet = false;
206207
while (mHBFoffset32 < (mTotalHBFPayLoad / 4)) {
207208
if (mOptions[TRDVerboseBit]) {
208209
LOGP(info, "Current half-CRU iteration {}, current offset in the HBF payload {}, total payload in number of 32-bit words {}", iteration, mHBFoffset32, mTotalHBFPayLoad / 4);
@@ -305,8 +306,10 @@ bool CruRawReader::parseDigitHCHeaders(int hcid)
305306
}
306307
incrementErrors(DigitHCHeader2Problem, hcid);
307308
}
309+
/* Currently we don't do anything with the information stored in DigitHCHeader2
308310
DigitHCHeader2 header2;
309311
header2.word = headers[headerwordcount];
312+
*/
310313
headersfound.set(1);
311314
break;
312315

@@ -407,7 +410,7 @@ bool CruRawReader::processHalfCRU(int iteration)
407410
return true;
408411
}
409412

410-
if (iteration > 0) {
413+
if (mPreviousHalfCRUHeaderSet) {
411414
// for the second trigger (and thus second HalfCRUHeader we see) we can do some more sanity checks
412415
// in case one check fails, we try to go to the next HalfCRUHeader
413416
if (mCurrentHalfCRUHeader.EndPoint != mPreviousHalfCRUHeader.EndPoint) {
@@ -432,6 +435,7 @@ bool CruRawReader::processHalfCRU(int iteration)
432435
}
433436
}
434437
mPreviousHalfCRUHeader = mCurrentHalfCRUHeader;
438+
mPreviousHalfCRUHeaderSet = true;
435439

436440
//can this half cru length fit into the available space of the rdh accumulated payload
437441
if (totalHalfCRUDataLength32 > (mTotalHBFPayLoad / 4) - mHBFoffset32) {
@@ -466,19 +470,17 @@ bool CruRawReader::processHalfCRU(int iteration)
466470
int cruIdx = mFEEID.supermodule * 2 + mFEEID.side; // 2 CRUs per SM, side defining A/C-side CRU
467471
int halfCruIdx = cruIdx * 2 + mFEEID.endpoint; // endpoint (0 or 1) defines half-CRU
468472
int linkIdxGlobal = halfCruIdx * NLINKSPERHALFCRU + currentlinkindex; // global link ID [0..1079]
469-
int halfChamberId = HelperMethods::getHCIDFromLinkID(linkIdxGlobal);
470-
// int halfChamberId = mLinkMap->getHCID(linkIdxGlobal); FIXME: uncomment, when object available in CCDB
471-
// TODO we keep detector, stack, layer, sector, side for now to be compatible to the current code state,
473+
int halfChamberId = mLinkMap->getHCID(linkIdxGlobal);
474+
// TODO we keep detector, stack, layer, side for now to be compatible to the current code state,
472475
// but halfChamberId contains everything we need to know... More cleanup to be done in second step
473476
int detectorId = halfChamberId / 2;
474477
int stack = HelperMethods::getStack(detectorId);
475478
int layer = HelperMethods::getLayer(detectorId);
476-
int sector = HelperMethods::getSector(detectorId);
477479
int side = halfChamberId % 2;
478480
int stack_layer = stack * NLAYER + layer; // similarly this is also only for graphing so just use the rdh ones for now.
479481
mEventRecords.incLinkErrorFlags(mFEEID.supermodule, side, stack_layer, mCurrentHalfCRULinkErrorFlags[currentlinkindex]);
480-
int currentlinksize32 = mCurrentHalfCRULinkLengths[currentlinkindex] * 8; // x8 to go from 256 bits to 32 bit;
481-
int endOfCurrentLink = mHBFoffset32 + currentlinksize32;
482+
uint32_t currentlinksize32 = mCurrentHalfCRULinkLengths[currentlinkindex] * 8; // x8 to go from 256 bits to 32 bit;
483+
uint32_t endOfCurrentLink = mHBFoffset32 + currentlinksize32;
482484

483485
linksizeAccum32 += currentlinksize32;
484486
if (currentlinksize32 == 0) {
@@ -500,27 +502,25 @@ bool CruRawReader::processHalfCRU(int iteration)
500502
LOGF(info, "Tracklet parser starting at offset %u and processing up to %u words", mHBFoffset32, currentlinksize32);
501503
}
502504
int trackletWordsRejected = 0;
503-
// LOGF(warn, "Starting tracklet parsing for HCID %i", halfChamberId);
504505
int trackletWordsRead = parseTrackletLinkData(currentlinksize32, halfChamberId, trackletWordsRejected);
505506
std::chrono::duration<double, std::micro> trackletparsingtime = std::chrono::high_resolution_clock::now() - trackletparsingstart;
506507
if (trackletWordsRead == -1) {
507-
//something went wrong bailout of here.
508-
if (mMaxWarnPrinted > 0) {
509-
LOG(warn) << "Tracklet parser returned -1 for link " << currentlinkindex;
510-
checkNoWarn();
511-
}
508+
// something went wrong bailout of here.
512509
mHBFoffset32 = hbfOffsetTmp + linksizeAccum32;
513510
incrementErrors(TrackletsReturnedMinusOne, halfChamberId);
514511
continue; // move to next link of this half-CRU
515512
}
516513
mHBFoffset32 += trackletWordsRead;
517514
if (mCurrentHalfCRUHeader.EventType == ETYPEPHYSICSTRIGGER &&
518515
endOfCurrentLink - mHBFoffset32 >= 8) {
516+
/*
517+
// disabled for the same reason as for the warning after the digits parsing below
519518
if (mMaxWarnPrinted > 0) {
520-
LOGF(warn, "After successfully parsing the tracklet data for link %i there are %i words remaining which did not get parsed", currentlinkindex, endOfCurrentLink - mHBFoffset32);
519+
LOGF(warn, "After successfully parsing the tracklet data for link %i there are %u words remaining which did not get parsed", currentlinkindex, endOfCurrentLink - mHBFoffset32);
521520
checkNoWarn();
522521
}
523522
incrementErrors(UnparsedTrackletDataRemaining, halfChamberId, fmt::format("On link {} there are {} words remaining which did not get parsed", currentlinkindex, endOfCurrentLink - mHBFoffset32));
523+
*/
524524
}
525525
mEventRecords.getCurrentEventRecord().incTrackletTime((double)std::chrono::duration_cast<std::chrono::microseconds>(trackletparsingtime).count());
526526
if (mOptions[TRDVerboseBit]) {
@@ -581,10 +581,14 @@ bool CruRawReader::processHalfCRU(int iteration)
581581
if (endOfCurrentLink - mHBFoffset32 >= 8) {
582582
// check if some data is lost (probably due to bug in CRU user logic)
583583
// we should have max 7 padding words to align the link to 256 bits
584+
/*
585+
// due to the current CRU bug this is almost always the case
586+
// TODO enable warning again when CRU UL is fixed
584587
if (mMaxWarnPrinted > 0) {
585-
LOGF(warn, "After successfully parsing the digit data for link %i there are %i words remaining which did not get parsed", currentlinkindex, endOfCurrentLink - mHBFoffset32);
588+
LOGF(warn, "After successfully parsing the digit data for link %i there are %u words remaining which did not get parsed", currentlinkindex, endOfCurrentLink - mHBFoffset32);
586589
checkNoWarn();
587590
}
591+
*/
588592
incrementErrors(UnparsedDigitDataRemaining, halfChamberId, fmt::format("On link {} there are {} words remaining which did not get parsed", currentlinkindex, endOfCurrentLink - mHBFoffset32));
589593
}
590594
mEventRecords.getCurrentEventRecord().incDigitTime((double)std::chrono::duration_cast<std::chrono::microseconds>(digitsparsingtime).count());
@@ -630,7 +634,7 @@ bool CruRawReader::processHalfCRU(int iteration)
630634

631635
bool CruRawReader::isTrackletHCHeaderOK(const TrackletHCHeader& header, int& hcid)
632636
{
633-
if (header.one != 1) {
637+
if (!sanityCheckTrackletHCHeader(header)) {
634638
return false;
635639
}
636640
int detHeader = HelperMethods::getDetector(((~header.supermodule) & 0x1f), ((~header.stack) & 0x7), ((~header.layer) & 0x7));
@@ -644,12 +648,10 @@ bool CruRawReader::isTrackletHCHeaderOK(const TrackletHCHeader& header, int& hci
644648
}
645649

646650
if (hcid != hcidHeader) {
647-
/* FIXME currently would be flooded by these messages, as long as CCDB object not available
648651
if (mMaxWarnPrinted > 0) {
649652
LOGF(alarm, "RDH HCID %i, TrackletHCHeader HCID %i. Taking the TrackletHCHedaer as authority", hcid, hcidHeader);
650653
checkNoWarn();
651654
}
652-
*/
653655
hcid = hcidHeader;
654656
}
655657
return (hcid == hcidHeader);
@@ -658,7 +660,6 @@ bool CruRawReader::isTrackletHCHeaderOK(const TrackletHCHeader& header, int& hci
658660
int CruRawReader::parseDigitLinkData(int maxWords32, int hcid, int& wordsRejected)
659661
{
660662
int wordsRead = 0;
661-
int numberOfDigitsFound = 0;
662663
int state = StateDigitMCMHeader;
663664
DigitMCMHeader mcmHeader;
664665
DigitMCMADCMask adcMask;
@@ -806,11 +807,7 @@ int CruRawReader::parseDigitLinkData(int maxWords32, int hcid, int& wordsRejecte
806807
else if (state == StateSecondEndmarker) {
807808
++wordsRead;
808809
if (currWord != DIGITENDMARKER) {
809-
if (mMaxWarnPrinted > 0) {
810-
LOGF(warn, "Expected second digit end marker, but found 0x%08x instead", currWord);
811-
checkNoWarn();
812-
}
813-
incrementErrors(DigitParsingNoSecondEndmarker, hcid, "No second digit end marker found");
810+
incrementErrors(DigitParsingNoSecondEndmarker, hcid, fmt::format("Expected second digit end marker, but found {:#010x} instead", currWord));
814811
return -1;
815812
}
816813
state = StateFinished;
@@ -825,11 +822,7 @@ int CruRawReader::parseDigitLinkData(int maxWords32, int hcid, int& wordsRejecte
825822
// not good, something went wrong with digit parsing
826823
// e.g. we tried to move to the end marker but reached the link size
827824
// without finding one.
828-
if (mMaxWarnPrinted > 0) {
829-
LOGF(warn, "We exited the digit parser state machine in the state %i and not in the proper finished state", state);
830-
checkNoWarn();
831-
}
832-
incrementErrors(DigitParsingExitInWrongState, hcid, "Done with digit parsing but state is not StateFinished");
825+
incrementErrors(DigitParsingExitInWrongState, hcid, fmt::format("Done with digit parsing but state is not StateFinished but in state {}", state));
833826
return -1;
834827
}
835828
}
@@ -919,16 +912,14 @@ int CruRawReader::parseTrackletLinkData(int linkSize32, int& hcid, int& wordsRej
919912
if (currWord == TRACKLETENDMARKER) {
920913
if ((hcHeader.format & 0x2) == 0x2) {
921914
// format indicates no empty MCM headers are sent, so we should not see an end marker here
922-
// TODO add error message/counter for QC
923-
LOGF(warn, "For the MCM Header 0x%08x we expected a tracklet from CPU %i, but got an endmarker instead", mcmHeader.word, iCpu);
915+
incrementErrors(TrackletDataMissing, hcid, fmt::format("For the MCM Header {:#010x} we expected a tracklet from CPU {}, but got an endmarker instead", mcmHeader.word, iCpu));
924916
}
925917
state = StateSecondEndmarker; // we expect a second tracklet end marker to follow
926918
break;
927919
}
928920
if ((currWord & 0x1) == 0x1) {
929921
// the reserved bit of the trackler MCM data is set
930-
// TODO add error message/counter for QC
931-
LOGF(warn, "Invalid word 0x%08x for the expected TrackletMCMData", currWord);
922+
incrementErrors(TrackletMCMDataFailure, hcid, fmt::format("Invalid word {:#010x} for the expected TrackletMCMData", currWord));
932923
++wordsRejected;
933924
}
934925
TrackletMCMData mcmData;
@@ -971,10 +962,7 @@ int CruRawReader::parseTrackletLinkData(int linkSize32, int& hcid, int& wordsRej
971962
else if (state == StateSecondEndmarker) {
972963
++wordsRead;
973964
if (currWord != TRACKLETENDMARKER) {
974-
if (mMaxWarnPrinted > 0) {
975-
LOGF(warn, "Expected second tracklet end marker, but found 0x%08x instead", currWord);
976-
checkNoWarn();
977-
}
965+
incrementErrors(TrackletNoSecondEndMarker, hcid, fmt::format("Expected second tracklet end marker, but found {:#010x} instead", currWord));
978966
return -1;
979967
}
980968
state = StateFinished;
@@ -1028,7 +1016,9 @@ Tracklet64 CruRawReader::assembleTracklet64(int format, TrackletMCMHeader& mcmHe
10281016
slope ^= 0x80;
10291017
uint32_t hpid = (mcmHeader.word >> (1 + cpu * 8)) & 0xff;
10301018
uint32_t lpid = mcmData.pid;
1031-
uint32_t pid = (hpid << 12) | lpid;
1019+
// The combined 20 bit PID information from the MCM header and the tracklet word
1020+
// is given by ((hpid << 12) | lpid).
1021+
// hpid holds the upper 8 bit and lpid the lower 12 bit.
10321022
int q0, q1, q2;
10331023
if (format & 0x1) {
10341024
// DQR enabled
@@ -1060,12 +1050,10 @@ void CruRawReader::dumpInputPayload() const
10601050

10611051
void CruRawReader::run()
10621052
{
1063-
/* FIXME: uncomment, when object available in CCDB
10641053
if (!mLinkMap) {
10651054
LOG(error) << "No mapping for Link ID to HCID provided from CCDB";
10661055
return;
10671056
}
1068-
*/
10691057
if (mOptions[TRDVerboseBit]) {
10701058
dumpInputPayload();
10711059
}

0 commit comments

Comments
 (0)