Skip to content

Commit 422df60

Browse files
bazinskimartenole
bazinski
authored and
martenole
committed
TRD reformulate debug output
1 parent 7ce22b9 commit 422df60

21 files changed

+658
-1005
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,6 @@ struct HelperMethods {
156156
((word >> 8) & 0x0000FF00) |
157157
(word << 24);
158158
}
159-
inline static unsigned int swapByteOrderreturn(unsigned int word)
160-
{
161-
// word = (word >> 24) |
162-
// ((word << 8) & 0x00FF0000) |
163-
// ((word >> 8) & 0x0000FF00) |
164-
// (word << 24);
165-
return word;
166-
}
167159
};
168160

169161
} // namespace trd

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ struct TrackletHCHeader {
139139
uint32_t word;
140140
struct {
141141
uint32_t side : 1; // side of chamber
142-
uint32_t layer : 3;
143142
uint32_t stack : 3;
143+
uint32_t layer : 3;
144144
uint32_t supermodule : 5;
145145
uint32_t one : 1; //always 1
146146
uint32_t MCLK : 15; // MCM clock counter 120MHz ... for simulation -- incrementing, and uniform across an event
@@ -455,7 +455,7 @@ uint32_t getHalfCRULinkErrorFlag(const HalfCRUHeader& cruhead, const uint32_t li
455455
uint32_t getHalfCRULinkDataSize(const HalfCRUHeader& cruhead, const uint32_t link);
456456
void getHalfCRULinkErrorFlags(const HalfCRUHeader& cruheader, std::array<uint32_t, 15>& linkerrorflags);
457457
void getHalfCRULinkDataSizes(const HalfCRUHeader& cruheader, std::array<uint32_t, 15>& linksizes);
458-
int getNumberOfTrackletsFromHeader(const o2::trd::TrackletMCMHeader* header, bool verbose = false);
458+
int getNumberOfTrackletsFromHeader(const o2::trd::TrackletMCMHeader* header);
459459
int getChargesFromRawHeaders(const o2::trd::TrackletHCHeader& hcheader, const o2::trd::TrackletMCMHeader* header, const std::array<o2::trd::TrackletMCMData, 3>& data, std::array<uint8_t, 3>& q, int trackletindex);
460460
uint32_t getHCIDFromTrackletHCHeader(const TrackletHCHeader& header);
461461
std::ostream& operator<<(std::ostream& stream, const TrackletHCHeader& halfchamberheader);
@@ -474,6 +474,7 @@ void printTrackletMCMHeader(o2::trd::TrackletMCMHeader& mcmhead);
474474
void printDigitHCHeader(o2::trd::DigitHCHeader& digitmcmheader);
475475
void printDigitMCMData(o2::trd::DigitMCMData& digitmcmdata);
476476
void printDigitMCMHeader(o2::trd::DigitMCMHeader& digitmcmhead);
477+
void printDigitMCMADCMask(o2::trd::DigitMCMADCMask& digitmcmadcmask);
477478

478479
void printHalfCRUHeader(o2::trd::HalfCRUHeader& halfcru);
479480
void dumpHalfCRUHeader(o2::trd::HalfCRUHeader& halfcru);

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

Lines changed: 126 additions & 72 deletions
Large diffs are not rendered by default.

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,16 @@ std::ostream& operator<<(std::ostream& stream, const TrackletMCMHeader& mcmhead)
6060

6161
void dumpHalfCRUHeader(o2::trd::HalfCRUHeader& halfcru)
6262
{
63-
std::array<uint64_t, 8> raw{};
63+
std::array<uint32_t, 16> raw{};
6464
memcpy(&raw[0], &halfcru, sizeof(halfcru));
6565
for (int i = 0; i < 2; i++) {
66-
int index = 4 * i;
67-
LOGF(info, "[1/2CRUHeader %d] 0x%08x 0x%08x 0x%08x 0x%08x", i, raw[index + 3], raw[index + 2],
68-
raw[index + 1], raw[index + 0]);
66+
std::stringstream message;
67+
int index = 8 * i;
68+
message << "[1/2CRUHeader:" << i << "] : ";
69+
for (int z = 0; z < 8; ++z) {
70+
message << "::0x" << std::hex << std::setw(8) << std::setfill('0') << raw[z + index] << " ";
71+
}
72+
LOG(info) << message.str();
6973
}
7074
}
7175

@@ -171,7 +175,7 @@ uint32_t getHCIDFromTrackletHCHeader(const TrackletHCHeader& header)
171175
return header.layer * 2 + header.stack * constants::NLAYER * 2 + header.supermodule * constants::NLAYER * constants::NSTACK * 2 + header.side;
172176
}
173177

174-
int getNumberOfTrackletsFromHeader(const o2::trd::TrackletMCMHeader* header, bool verbose)
178+
int getNumberOfTrackletsFromHeader(const o2::trd::TrackletMCMHeader* header)
175179
{
176180
int headertrackletcount = 0;
177181
if (header->pid0 != 0xff) { // pid of cpu0
@@ -301,11 +305,9 @@ void printTrackletMCMData(o2::trd::TrackletMCMData& tracklet)
301305
}
302306
void printTrackletMCMHeader(o2::trd::TrackletMCMHeader& mcmhead)
303307
{
304-
LOG(info) << " about to print mcm raw header";
305308
LOGF(info, "MCMRawHeader: Raw:0x%08x 1:%d padrow: 0x%02x col: 0x%01x pid2 0x%02x pid1: 0x%02x pid0: 0x%02x 1:%d",
306309
mcmhead.word, mcmhead.onea, mcmhead.padrow, mcmhead.col,
307310
mcmhead.pid2, mcmhead.pid1, mcmhead.pid0, mcmhead.oneb);
308-
LOG(info) << " printed mcm raw header";
309311
}
310312

311313
void printHalfCRUHeader(o2::trd::HalfCRUHeader& halfcru)
@@ -495,6 +497,11 @@ void printDigitMCMData(o2::trd::DigitMCMData& digitmcmdata)
495497
LOGF(info, "DigitMCMRawData: Raw:0x%08x res(0xc):0x%02x x: 0x%04x y: 0x%04x z 0x%04x ",
496498
digitmcmdata.word, digitmcmdata.c, digitmcmdata.x, digitmcmdata.y, digitmcmdata.z);
497499
}
500+
void printDigitMCMADCMask(o2::trd::DigitMCMADCMask& digitmcmadcmask)
501+
{
502+
LOGF(info, "DigitMCMADCMask: Raw:0x%08x j(0xc):0x%01x mask: 0x%05x count: 0x%02x n(0x1) 0x%01x ",
503+
digitmcmadcmask.word, digitmcmadcmask.j, digitmcmadcmask.adcmask, digitmcmadcmask.c, digitmcmadcmask.n);
504+
}
498505

499506
int getDigitHCHeaderWordType(uint32_t word)
500507
{
@@ -545,7 +552,7 @@ void printDigitHCHeader(o2::trd::DigitHCHeader& header, uint32_t headers[3])
545552
printDigitHCHeaders(header, headers, -1, 0, true);
546553
int countheaderwords = header.numberHCW;
547554
int index;
548-
//for the currently 3 implemeented other header words, they can come in any order, and are identified by their reserved portion
555+
//for the currently 3 implemented other header words, they can come in any order, and are identified by their reserved portion
549556
for (int countheaderwords = 0; countheaderwords < header.numberHCW; ++countheaderwords) {
550557
switch (getDigitHCHeaderWordType(headers[countheaderwords])) {
551558
case 1:

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,3 @@
2121
// Primarily to QC and debug graphs built into the readers.
2222
// This file is primarily for the strings that appear at titles in the graphs.
2323

24-
std::vector<std::string> ParsingErrorsString{"TRDParsingNoError",
25-
"TRDParsingUnrecognisedVersion",
26-
"TRDParsingBadDigt",
27-
"TRDParsingBadTracklet",
28-
"TRDParsingDigitEndMarkerWrongState",
29-
"TRDParsingDigitMCMHeaderSanityCheckFailure",
30-
"TRDParsingDigitROBDecreasing",
31-
"TRDParsingDigitMCMNotIncreasing",
32-
"TRDParsingDigitADCMaskMismatch",
33-
"TRDParsingDigitADCMaskAdvanceToEnd",
34-
"TRDParsingDigitMCMHeaderBypassButStateMCMHeader",
35-
"TRDParsingDigitEndMarkerStateButReadingMCMADCData",
36-
"TRDParsingDigitADCChannel21",
37-
"TRDParsingDigitADCChannelGT22",
38-
"TRDParsingDigitGT10ADCs",
39-
"TRDParsingDigitSanityCheck",
40-
"TRDParsingDigitExcessTimeBins",
41-
"TRDParsingDigitParsingExitInWrongState",
42-
"TRDParsingDigitStackMisMatch",
43-
"TRDParsingDigitLayerMisMatch",
44-
"TRDParsingDigitSectorMisMatch",
45-
"TRDParsingTrackletCRUPaddingWhileParsingTracklets",
46-
"TRDParsingTrackletBit11NotSetInTrackletHCHeader",
47-
"TRDParsingTrackletHCHeaderSanityCheckFailure",
48-
"TRDParsingTrackletMCMHeaderSanityCheckFailure",
49-
"TRDParsingTrackletMCMHeaderButParsingMCMData",
50-
"TRDParsingTrackletStateMCMHeaderButParsingMCMData",
51-
"TRDParsingTrackletTrackletCountGTThatDeclaredInMCMHeader",
52-
"TRDParsingTrackletInvalidTrackletCount",
53-
"TRDParsingTrackletPadRowIncreaseError",
54-
"TRDParsingTrackletColIncreaseError",
55-
"TRDParsingTrackletNoTrackletEndMarker",
56-
"TRDParsingTrackletExitingNoTrackletEndMarker"};

‎Detectors/TRD/reconstruction/CMakeLists.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ o2_add_library(TRDReconstruction
1515
src/DigitsParser.cxx
1616
src/TrackletsParser.cxx
1717
src/CruRawReader.cxx
18-
src/CompressedRawReader.cxx
1918
src/DataReaderTask.cxx
20-
src/CruCompressorTask.cxx
2119
src/EventRecord.cxx
2220
PUBLIC_LINK_LIBRARIES O2::TRDBase
2321
O2::DataFormatsTRD
@@ -30,12 +28,6 @@ o2_add_library(TRDReconstruction
3028
Microsoft.GSL::GSL)
3129

3230

33-
o2_add_executable(compressor
34-
COMPONENT_NAME trd
35-
SOURCES src/CruCompressor.cxx
36-
PUBLIC_LINK_LIBRARIES O2::TRDReconstruction
37-
)
38-
3931
o2_add_executable(datareader
4032
COMPONENT_NAME trd
4133
SOURCES src/DataReader.cxx

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

Lines changed: 0 additions & 156 deletions
This file was deleted.

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

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)