Skip to content

Commit 84ed23d

Browse files
shahor02shahor02
committed
Fix: sdd missing print methods, move prints to cxx
1 parent 97e411a commit 84ed23d

7 files changed

Lines changed: 149 additions & 79 deletions

File tree

‎DataFormats/Detectors/FIT/FDD/include/DataFormatsFDD/RawEventData.h‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include "DataFormatsFDD/LookUpTable.h"
2323
#include <CommonDataFormat/InteractionRecord.h>
2424
#include <Framework/Logger.h>
25-
#include <iostream>
26-
#include <iomanip>
2725
#include <cstring>
2826
#include "Rtypes.h"
2927

@@ -51,7 +49,9 @@ struct EventHeader {
5149
};
5250
};
5351
InteractionRecord getIntRec() const { return InteractionRecord{(uint16_t)bc, (uint32_t)orbit}; }
52+
void print() const;
5453
};
54+
5555
struct EventData {
5656
static constexpr size_t PayloadSize = 5;
5757
static constexpr size_t PayloadPerGBTword = 10;
@@ -97,6 +97,7 @@ struct EventData {
9797
{
9898
return uint8_t(word >> BitFlagPos);
9999
}
100+
void print() const;
100101
};
101102

102103
struct TCMdata {
@@ -136,6 +137,7 @@ struct TCMdata {
136137
trg.timeA = (int16_t)timeA;
137138
trg.timeC = (int16_t)timeC;
138139
}
140+
void print() const;
139141
};
140142

141143
class RawEventData
@@ -144,9 +146,9 @@ class RawEventData
144146
RawEventData() = default;
145147
EventHeader* getEventHeaderPtr() { return &mEventHeader; }
146148
EventData* getEventDataPtr() { return mEventData; }
147-
void print();
148-
void printHexEventHeader();
149-
void printHexEventData(uint64_t i);
149+
void print() const;
150+
void printHexEventHeader() const;
151+
void printHexEventData(uint64_t i) const;
150152
enum EEventDataBit { kNumberADC,
151153
kIsDoubleEvent,
152154
kIs1TimeLostEvent,

‎DataFormats/Detectors/FIT/FDD/src/RawEventData.cxx‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,63 @@
1010

1111
#include "DataFormatsFDD/RawEventData.h"
1212
#include <sstream>
13+
#include <iostream>
1314

1415
using namespace o2::fdd;
1516

16-
ClassImp(RawEventData);
17+
void EventHeader::print() const
18+
{
19+
std::cout << std::hex;
20+
std::cout << "################EventHeader###############" << std::endl;
21+
std::cout << "startDescriptor: " << startDescriptor << std::endl;
22+
std::cout << "nGBTWords: " << nGBTWords << std::endl;
23+
std::cout << "BC: " << bc << std::endl;
24+
std::cout << "Orbit: " << orbit << std::endl;
25+
std::cout << "##########################################" << std::endl;
26+
std::cout << std::dec;
27+
}
28+
29+
void EventData::print() const
30+
{
31+
std::cout << std::hex;
32+
std::cout << "###############EventData(PM)##############" << std::endl;
33+
std::cout << "------------Channel " << channelID << "------------" << std::endl;
34+
std::cout << "Charge: " << charge << std::endl;
35+
std::cout << "Time: " << time << std::endl;
36+
std::cout << "numberADC: " << numberADC << std::endl;
37+
std::cout << "isDoubleEvent: " << isDoubleEvent << std::endl;
38+
std::cout << "is1TimeLostEvent: " << is1TimeLostEvent << std::endl;
39+
std::cout << "is2TimeLostEvent: " << is2TimeLostEvent << std::endl;
40+
std::cout << "isADCinGate : " << isADCinGate << std::endl;
41+
std::cout << "isTimeInfoLate: " << isTimeInfoLate << std::endl;
42+
std::cout << "isAmpHigh: " << isAmpHigh << std::endl;
43+
std::cout << "isEventInTVDC: " << isEventInTVDC << std::endl;
44+
std::cout << "isTimeInfoLost: " << isTimeInfoLost << std::endl;
45+
std::cout << "channelID: " << channelID << std::endl;
46+
std::cout << "##########################################" << std::endl;
47+
std::cout << std::dec;
48+
}
49+
50+
void TCMdata::print() const
51+
{
52+
std::cout << std::hex;
53+
std::cout << "################TCMdata###################" << std::endl;
54+
std::cout << "orC: " << orC << std::endl;
55+
std::cout << "orA: " << orA << std::endl;
56+
std::cout << "sCen: " << sCen << std::endl;
57+
std::cout << "cen: " << cen << std::endl;
58+
std::cout << "vertex: " << vertex << std::endl;
59+
std::cout << "nChanA: " << nChanA << std::endl;
60+
std::cout << "nChanC: " << nChanC << std::endl;
61+
std::cout << "amplA: " << amplA << std::endl;
62+
std::cout << "amplC: " << amplC << std::endl;
63+
std::cout << "timeA: " << timeA << std::endl;
64+
std::cout << "timeC: " << timeC << std::endl;
65+
std::cout << "##########################################" << std::endl;
66+
std::cout << std::dec;
67+
}
1768

18-
void RawEventData::print()
69+
void RawEventData::print() const
1970
{
2071
std::cout << "==================Raw event data==================" << std::endl;
2172
std::cout << "##################Header##################" << std::endl;
@@ -42,7 +93,7 @@ void RawEventData::print()
4293
std::cout << "##########################################" << std::endl;
4394
}
4495

45-
void RawEventData::printHexEventHeader()
96+
void RawEventData::printHexEventHeader() const
4697
{
4798
std::stringstream ssheader;
4899
ssheader << std::setfill('0') << std::setw(16) << std::hex << mEventHeader.word[0] << " " << std::setw(16) << mEventHeader.word[1] << "\n ";
@@ -56,7 +107,7 @@ void RawEventData::printHexEventHeader()
56107
LOG(DEBUG) << ssheader.str();
57108
}
58109

59-
void RawEventData::printHexEventData(uint64_t i)
110+
void RawEventData::printHexEventData(uint64_t i) const
60111
{
61112
std::stringstream ssdata;
62113
ssdata << "D0:0x ";

‎DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RawEventData.h‎

Lines changed: 7 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "DataFormatsFT0/LookUpTable.h"
2323
#include <CommonDataFormat/InteractionRecord.h>
2424
#include <Framework/Logger.h>
25-
#include <iostream>
2625
#include <utility>
2726
#include <cstring>
2827
#include "Rtypes.h"
28+
2929
namespace o2
3030
{
3131
namespace ft0
@@ -56,18 +56,9 @@ struct EventHeader {
5656
};
5757
InteractionRecord getIntRec() const { return InteractionRecord{(uint16_t)bc, (uint32_t)orbit}; }
5858

59-
void print() const
60-
{
61-
std::cout << std::hex;
62-
std::cout << "################EventHeader###############" << std::endl;
63-
std::cout << "startDescriptor: " << startDescriptor << std::endl;
64-
std::cout << "nGBTWords: " << nGBTWords << std::endl;
65-
std::cout << "BC: " << bc << std::endl;
66-
std::cout << "Orbit: " << orbit << std::endl;
67-
std::cout << "##########################################" << std::endl;
68-
std::cout << std::dec;
69-
}
59+
void print() const;
7060
};
61+
7162
struct EventData {
7263
static constexpr size_t PayloadSize = 5;
7364
static constexpr size_t PayloadPerGBTword = 10;
@@ -108,24 +99,7 @@ struct EventData {
10899
{
109100
return uint8_t(word >> BitFlagPos);
110101
}
111-
void print() const
112-
{
113-
std::cout << std::hex;
114-
std::cout << "###############EventData(PM)##############" << std::endl;
115-
std::cout << "------------Channel " << channelID << "------------" << std::endl;
116-
std::cout << "Charge: " << charge << std::endl;
117-
std::cout << "Time: " << time << std::endl;
118-
std::cout << "numberADC: " << numberADC << std::endl;
119-
std::cout << "isDoubleEvent: " << isDoubleEvent << std::endl;
120-
std::cout << "isTimeInfoNOTvalid: " << isTimeInfoNOTvalid << std::endl;
121-
std::cout << "isCFDinADCgate: " << isCFDinADCgate << std::endl;
122-
std::cout << "isTimeInfoLate: " << isTimeInfoLate << std::endl;
123-
std::cout << "isAmpHigh: " << isAmpHigh << std::endl;
124-
std::cout << "isEventInTVDC: " << isEventInTVDC << std::endl;
125-
std::cout << "isTimeInfoLost: " << isTimeInfoLost << std::endl;
126-
std::cout << "##########################################" << std::endl;
127-
std::cout << std::dec;
128-
}
102+
void print() const;
129103

130104
//temporary, this method should be in ChannelData struct, TODO
131105
void fillChannelData(ChannelData& channelData) const
@@ -165,25 +139,7 @@ struct TCMdata {
165139
reservedField7 : 1, //79 bit
166140
reservedField8 : 48; //80 bit
167141

168-
void print() const
169-
{
170-
std::cout << std::hex;
171-
std::cout << "################TCMdata###################" << std::endl;
172-
std::cout << "orC: " << orC << std::endl;
173-
std::cout << "orA: " << orA << std::endl;
174-
std::cout << "sCen: " << sCen << std::endl;
175-
std::cout << "cen: " << cen << std::endl;
176-
std::cout << "vertex: " << vertex << std::endl;
177-
std::cout << "nChanA: " << nChanA << std::endl;
178-
std::cout << "nChanC: " << nChanC << std::endl;
179-
std::cout << "amplA: " << amplA << std::endl;
180-
std::cout << "amplC: " << amplC << std::endl;
181-
std::cout << "timeA: " << timeA << std::endl;
182-
std::cout << "timeC: " << timeC << std::endl;
183-
std::cout << "##########################################" << std::endl;
184-
185-
std::cout << std::dec;
186-
}
142+
void print() const;
187143

188144
//temporary, this method should be in Triggers struct, TODO
189145
void fillTrigger(Triggers& trg)
@@ -212,23 +168,14 @@ struct TCMdataExtended {
212168
uint32_t triggerWord;
213169
};
214170

215-
void print() const
216-
{
217-
218-
std::cout << std::hex;
219-
std::cout << "############TCMdataExtended###############" << std::endl;
220-
std::cout << "triggerWord: " << triggerWord << std::endl;
221-
std::cout << "##########################################" << std::endl;
222-
223-
std::cout << std::dec;
224-
}
171+
void print() const;
225172
};
226173

227174
class RawEventData
228175
{
229176
public:
230177
RawEventData() = default;
231-
void print();
178+
void print() const;
232179
const static int gStartDescriptor = 0x0000000f;
233180

234181
int size() const

‎DataFormats/Detectors/FIT/FT0/src/RawEventData.cxx‎

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,61 @@
1515

1616
using namespace o2::ft0;
1717

18-
ClassImp(RawEventData);
18+
void EventHeader::print() const
19+
{
20+
std::cout << std::hex;
21+
std::cout << "################EventHeader###############" << std::endl;
22+
std::cout << "startDescriptor: " << startDescriptor << std::endl;
23+
std::cout << "nGBTWords: " << nGBTWords << std::endl;
24+
std::cout << "BC: " << bc << std::endl;
25+
std::cout << "Orbit: " << orbit << std::endl;
26+
std::cout << "##########################################" << std::endl;
27+
std::cout << std::dec;
28+
}
29+
30+
void EventData::print() const
31+
{
32+
std::cout << std::hex;
33+
std::cout << "###############EventData(PM)##############" << std::endl;
34+
std::cout << "------------Channel " << channelID << "------------" << std::endl;
35+
std::cout << "Charge: " << charge << std::endl;
36+
std::cout << "Time: " << time << std::endl;
37+
std::cout << "numberADC: " << numberADC << std::endl;
38+
std::cout << "isDoubleEvent: " << isDoubleEvent << std::endl;
39+
std::cout << "isTimeInfoNOTvalid: " << isTimeInfoNOTvalid << std::endl;
40+
std::cout << "isCFDinADCgate: " << isCFDinADCgate << std::endl;
41+
std::cout << "isTimeInfoLate: " << isTimeInfoLate << std::endl;
42+
std::cout << "isAmpHigh: " << isAmpHigh << std::endl;
43+
std::cout << "isEventInTVDC: " << isEventInTVDC << std::endl;
44+
std::cout << "isTimeInfoLost: " << isTimeInfoLost << std::endl;
45+
std::cout << "##########################################" << std::endl;
46+
std::cout << std::dec;
47+
}
48+
49+
void TCMdata::print() const
50+
{
51+
std::cout << std::hex;
52+
std::cout << "################TCMdata###################" << std::endl;
53+
std::cout << "orC: " << orC << std::endl;
54+
std::cout << "orA: " << orA << std::endl;
55+
std::cout << "sCen: " << sCen << std::endl;
56+
std::cout << "cen: " << cen << std::endl;
57+
std::cout << "vertex: " << vertex << std::endl;
58+
std::cout << "nChanA: " << nChanA << std::endl;
59+
std::cout << "nChanC: " << nChanC << std::endl;
60+
std::cout << "amplA: " << amplA << std::endl;
61+
std::cout << "amplC: " << amplC << std::endl;
62+
std::cout << "timeA: " << timeA << std::endl;
63+
std::cout << "timeC: " << timeC << std::endl;
64+
std::cout << "##########################################" << std::endl;
65+
std::cout << std::dec;
66+
}
67+
68+
void TCMdataExtended::print() const
69+
{
70+
std::cout << std::hex;
71+
std::cout << "############TCMdataExtended###############" << std::endl;
72+
std::cout << "triggerWord: " << triggerWord << std::endl;
73+
std::cout << "##########################################" << std::endl;
74+
std::cout << std::dec;
75+
}

‎DataFormats/Detectors/FIT/FV0/include/DataFormatsFV0/RawEventData.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "DataFormatsFV0/LookUpTable.h"
2222
#include <CommonDataFormat/InteractionRecord.h>
2323
#include <Framework/Logger.h>
24-
#include <iostream>
25-
#include <iomanip>
2624
#include <cstring>
2725
#include "Rtypes.h"
2826

@@ -44,7 +42,9 @@ struct EventHeader {
4442
uint64_t reservedField3 : 48;
4543
};
4644
};
45+
void print() const;
4746
};
47+
4848
struct EventData {
4949
union {
5050
uint64_t word = {0};
@@ -109,9 +109,9 @@ class RawEventData
109109
RawEventData() = default;
110110
EventHeader* getEventHeaderPtr() { return &mEventHeader; }
111111
EventData* getEventDataPtr() { return mEventData; }
112-
void print();
113-
void printHexEventHeader();
114-
void printHexEventData(uint64_t i);
112+
void print() const;
113+
void printHexEventHeader() const;
114+
void printHexEventData(uint64_t i) const;
115115
enum EEventDataBit { kNumberADC,
116116
kIsDoubleEvent,
117117
kIs1TimeLostEvent,

‎DataFormats/Detectors/FIT/FV0/src/RawEventData.cxx‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,25 @@
1010

1111
#include "DataFormatsFV0/RawEventData.h"
1212
#include <sstream>
13+
#include <iostream>
1314

1415
using namespace o2::fv0;
1516

1617
ClassImp(RawEventData);
1718

18-
void RawEventData::print()
19+
void EventHeader::print() const
20+
{
21+
std::cout << std::hex;
22+
std::cout << "################EventHeader###############" << std::endl;
23+
std::cout << "startDescriptor: " << startDescriptor << std::endl;
24+
std::cout << "nGBTWords: " << nGBTWords << std::endl;
25+
std::cout << "BC: " << bc << std::endl;
26+
std::cout << "Orbit: " << orbit << std::endl;
27+
std::cout << "##########################################" << std::endl;
28+
std::cout << std::dec;
29+
}
30+
31+
void RawEventData::print() const
1932
{
2033
std::cout << "==================Raw event data==================" << std::endl;
2134
std::cout << "##################Header##################" << std::endl;
@@ -42,7 +55,7 @@ void RawEventData::print()
4255
std::cout << "##########################################" << std::endl;
4356
}
4457

45-
void RawEventData::printHexEventHeader()
58+
void RawEventData::printHexEventHeader() const
4659
{
4760
std::stringstream ssheader;
4861
ssheader << std::setfill('0') << std::setw(16) << std::hex << mEventHeader.word[0] << " " << std::setw(16) << mEventHeader.word[1] << "\n ";
@@ -56,7 +69,7 @@ void RawEventData::printHexEventHeader()
5669
LOG(DEBUG) << ssheader.str();
5770
}
5871

59-
void RawEventData::printHexEventData(uint64_t i)
72+
void RawEventData::printHexEventData(uint64_t i) const
6073
{
6174
std::stringstream ssdata;
6275
ssdata << "D0:0x ";

‎Detectors/FIT/raw/include/FITRaw/DataBlockBase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ struct DataBlockWrapper {
286286
{
287287
assert(mNelements <= T::MaxNelements);
288288
for (int i = 0; i < mNelements; i++) {
289-
std::cout << "\nPringting element number: " << i << std::endl;
289+
std::cout << "\nPrinting element number: " << i << std::endl;
290290
mData[i].print();
291291
}
292292
}

0 commit comments

Comments
 (0)