Skip to content

Commit 8b58b23

Browse files
Dr15JonesDr15Jones
committed
Moved stored products in FLTDigi to versioned namespace
1 parent 3c99646 commit 8b58b23

3 files changed

Lines changed: 144 additions & 141 deletions

File tree

‎DataFormats/FTLDigi/interface/BTLSample.h‎

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -9,80 +9,81 @@
99
@class BTLSample
1010
@short wrapper for a data word
1111
*/
12+
namespace io_v1 {
13+
class BTLSample {
14+
public:
15+
enum BTLSampleDataMasks { kToA2Mask = 0x3ff, kToAMask = 0x3ff, kDataMask = 0x3ff };
16+
enum BTLSampleDataShifts { kToA2Shift = 20, kToAShift = 10, kDataShift = 0 };
1217

13-
class BTLSample {
14-
public:
15-
enum BTLSampleDataMasks { kToA2Mask = 0x3ff, kToAMask = 0x3ff, kDataMask = 0x3ff };
16-
enum BTLSampleDataShifts { kToA2Shift = 20, kToAShift = 10, kDataShift = 0 };
18+
enum BTLSampleFlagMasks { kThreshMask = 0x1, kModeMask = 0x1 };
19+
enum BTLSampleFlagShifts { kThreshShift = 1, kModeShift = 0 };
1720

18-
enum BTLSampleFlagMasks { kThreshMask = 0x1, kModeMask = 0x1 };
19-
enum BTLSampleFlagShifts { kThreshShift = 1, kModeShift = 0 };
20-
21-
/**
21+
/**
2222
@short CTOR
2323
*/
24-
BTLSample() : value_(0), flag_(0), row_(0), col_(0) {}
25-
BTLSample(uint32_t value, uint16_t flag, uint8_t row, uint8_t col)
26-
: value_(value), flag_(flag), row_(row), col_(col) {}
27-
BTLSample(const BTLSample& o) : value_(o.value_), flag_(o.flag_), row_(o.row_), col_(o.col_) {}
28-
BTLSample& operator=(const BTLSample&) = default;
24+
BTLSample() : value_(0), flag_(0), row_(0), col_(0) {}
25+
BTLSample(uint32_t value, uint16_t flag, uint8_t row, uint8_t col)
26+
: value_(value), flag_(flag), row_(row), col_(col) {}
27+
BTLSample(const BTLSample& o) : value_(o.value_), flag_(o.flag_), row_(o.row_), col_(o.col_) {}
28+
BTLSample& operator=(const BTLSample&) = default;
2929

30-
/**
30+
/**
3131
@short setters
3232
*/
33-
void setThreshold(bool thr) { setFlagWord(thr, kThreshMask, kThreshShift); }
34-
void setMode(bool mode) { setFlagWord(mode, kModeMask, kModeShift); }
35-
void setToA(uint16_t toa) { setDataWord(toa, kToAMask, kToAShift); }
36-
void setToA2(uint16_t toa2) { setDataWord(toa2, kToA2Mask, kToA2Shift); }
37-
void setData(uint16_t data) { setDataWord(data, kDataMask, kDataShift); }
38-
void set(bool thr, bool mode, uint16_t toa2, uint16_t toa, uint16_t data, uint8_t row, uint8_t col) {
39-
flag_ = (((uint16_t)thr & kThreshMask) << kThreshShift | ((uint16_t)mode & kModeMask) << kModeShift);
33+
void setThreshold(bool thr) { setFlagWord(thr, kThreshMask, kThreshShift); }
34+
void setMode(bool mode) { setFlagWord(mode, kModeMask, kModeShift); }
35+
void setToA(uint16_t toa) { setDataWord(toa, kToAMask, kToAShift); }
36+
void setToA2(uint16_t toa2) { setDataWord(toa2, kToA2Mask, kToA2Shift); }
37+
void setData(uint16_t data) { setDataWord(data, kDataMask, kDataShift); }
38+
void set(bool thr, bool mode, uint16_t toa2, uint16_t toa, uint16_t data, uint8_t row, uint8_t col) {
39+
flag_ = (((uint16_t)thr & kThreshMask) << kThreshShift | ((uint16_t)mode & kModeMask) << kModeShift);
4040

41-
value_ = (((uint32_t)toa2 & kToA2Mask) << kToA2Shift | ((uint32_t)toa & kToAMask) << kToAShift |
42-
((uint32_t)data & kDataMask) << kDataShift);
43-
row_ = row;
44-
col_ = col;
45-
}
46-
void print(std::ostream& out = std::cout) {
47-
out << "THR: " << threshold() << " Mode: " << mode() << " ToA2: " << toa2() << " ToA: " << toa()
48-
<< " Data: " << data() << " Row: " << (uint32_t)row() << " Column: " << (uint32_t)column() << " Raw Flag=0x"
49-
<< std::hex << raw_flag() << std::dec << " Raw Data=0x" << std::hex << raw_data() << std::dec << std::endl;
50-
}
41+
value_ = (((uint32_t)toa2 & kToA2Mask) << kToA2Shift | ((uint32_t)toa & kToAMask) << kToAShift |
42+
((uint32_t)data & kDataMask) << kDataShift);
43+
row_ = row;
44+
col_ = col;
45+
}
46+
void print(std::ostream& out = std::cout) {
47+
out << "THR: " << threshold() << " Mode: " << mode() << " ToA2: " << toa2() << " ToA: " << toa()
48+
<< " Data: " << data() << " Row: " << (uint32_t)row() << " Column: " << (uint32_t)column() << " Raw Flag=0x"
49+
<< std::hex << raw_flag() << std::dec << " Raw Data=0x" << std::hex << raw_data() << std::dec << std::endl;
50+
}
5151

52-
/**
52+
/**
5353
@short getters
5454
*/
55-
uint32_t raw_data() const { return value_; }
56-
uint16_t raw_flag() const { return flag_; }
57-
bool threshold() const { return ((flag_ >> kThreshShift) & kThreshMask); }
58-
bool mode() const { return ((flag_ >> kModeShift) & kModeMask); }
59-
uint32_t toa() const { return ((value_ >> kToAShift) & kToAMask); }
60-
uint32_t toa2() const { return ((value_ >> kToA2Shift) & kToA2Mask); }
61-
uint32_t data() const { return ((value_ >> kDataShift) & kDataMask); }
62-
uint8_t row() const { return row_; }
63-
uint8_t column() const { return col_; }
55+
uint32_t raw_data() const { return value_; }
56+
uint16_t raw_flag() const { return flag_; }
57+
bool threshold() const { return ((flag_ >> kThreshShift) & kThreshMask); }
58+
bool mode() const { return ((flag_ >> kModeShift) & kModeMask); }
59+
uint32_t toa() const { return ((value_ >> kToAShift) & kToAMask); }
60+
uint32_t toa2() const { return ((value_ >> kToA2Shift) & kToA2Mask); }
61+
uint32_t data() const { return ((value_ >> kDataShift) & kDataMask); }
62+
uint8_t row() const { return row_; }
63+
uint8_t column() const { return col_; }
6464

65-
private:
66-
/**
65+
private:
66+
/**
6767
@short wrapper to reset words at a given position
6868
*/
69-
void setDataWord(uint32_t word, uint32_t mask, uint32_t pos) {
70-
//clear required bits
71-
value_ &= ~(mask << pos);
72-
//now set the new value
73-
value_ |= ((word & mask) << pos);
74-
}
75-
void setFlagWord(uint16_t word, uint16_t mask, uint16_t pos) {
76-
//clear required bits
77-
flag_ &= ~(mask << pos);
78-
//now set the new value
79-
flag_ |= ((word & mask) << pos);
80-
}
81-
82-
// bit-words for data and flags
83-
uint32_t value_;
84-
uint16_t flag_;
85-
uint8_t row_, col_;
86-
};
69+
void setDataWord(uint32_t word, uint32_t mask, uint32_t pos) {
70+
//clear required bits
71+
value_ &= ~(mask << pos);
72+
//now set the new value
73+
value_ |= ((word & mask) << pos);
74+
}
75+
void setFlagWord(uint16_t word, uint16_t mask, uint16_t pos) {
76+
//clear required bits
77+
flag_ &= ~(mask << pos);
78+
//now set the new value
79+
flag_ |= ((word & mask) << pos);
80+
}
8781

82+
// bit-words for data and flags
83+
uint32_t value_;
84+
uint16_t flag_;
85+
uint8_t row_, col_;
86+
};
87+
} // namespace io_v1
88+
using BTLSample = io_v1::BTLSample;
8889
#endif

‎DataFormats/FTLDigi/interface/ETLSample.h‎

Lines changed: 76 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -9,93 +9,94 @@
99
@class ETLSample
1010
@short wrapper for a data word
1111
*/
12+
namespace io_v1 {
13+
class ETLSample {
14+
public:
15+
enum ETLSampleMasks {
16+
kThreshMask = 0x1,
17+
kModeMask = 0x1,
18+
kColumnMask = 0x1f,
19+
kRowMask = 0x3f,
20+
kToAMask = 0x7ff,
21+
kDataMask = 0xff,
22+
kToTMask = 0x7ff
23+
};
24+
enum ETLSampleShifts {
25+
kThreshShift = 31,
26+
kModeShift = 30,
27+
kColumnShift = 25,
28+
kRowShift = 19,
29+
kToAShift = 8,
30+
kDataShift = 0,
31+
kToTShift = 0
32+
};
1233

13-
class ETLSample {
14-
public:
15-
enum ETLSampleMasks {
16-
kThreshMask = 0x1,
17-
kModeMask = 0x1,
18-
kColumnMask = 0x1f,
19-
kRowMask = 0x3f,
20-
kToAMask = 0x7ff,
21-
kDataMask = 0xff,
22-
kToTMask = 0x7ff
23-
};
24-
enum ETLSampleShifts {
25-
kThreshShift = 31,
26-
kModeShift = 30,
27-
kColumnShift = 25,
28-
kRowShift = 19,
29-
kToAShift = 8,
30-
kDataShift = 0,
31-
kToTShift = 0
32-
};
33-
34-
/**
34+
/**
3535
@short CTOR
3636
*/
37-
ETLSample() : value_(0), valueToT_(0) {}
38-
ETLSample(uint32_t value) : value_(value), valueToT_(0) {}
39-
ETLSample(uint32_t value, uint32_t valueToT) : value_(value), valueToT_(valueToT) {}
40-
ETLSample(const ETLSample& o) : value_(o.value_), valueToT_(o.valueToT_) {}
41-
ETLSample& operator=(const ETLSample&) = default;
37+
ETLSample() : value_(0), valueToT_(0) {}
38+
ETLSample(uint32_t value) : value_(value), valueToT_(0) {}
39+
ETLSample(uint32_t value, uint32_t valueToT) : value_(value), valueToT_(valueToT) {}
40+
ETLSample(const ETLSample& o) : value_(o.value_), valueToT_(o.valueToT_) {}
41+
ETLSample& operator=(const ETLSample&) = default;
4242

43-
/**
43+
/**
4444
@short setters
4545
*/
46-
void setThreshold(bool thr) { setWord(thr, kThreshMask, kThreshShift); }
47-
void setMode(bool mode) { setWord(mode, kModeMask, kModeShift); }
48-
void setColumn(uint8_t col) { setWord(col, kColumnMask, kColumnShift); }
49-
void setRow(uint8_t row) { setWord(row, kRowMask, kRowShift); }
50-
void setToA(uint16_t toa) { setWord(toa, kToAMask, kToAShift); }
51-
void setToT(uint16_t tot) { setWordToT(tot, kToTMask, kToTShift); }
52-
void setData(uint16_t data) { setWord(data, kDataMask, kDataShift); }
53-
void set(bool thr, bool mode, uint16_t toa, uint16_t tot, uint16_t data, uint8_t row, uint8_t col) {
54-
value_ = (((uint32_t)thr & kThreshMask) << kThreshShift | ((uint32_t)mode & kModeMask) << kModeShift |
55-
((uint32_t)col & kColumnMask) << kColumnShift | ((uint32_t)row & kRowMask) << kRowShift |
56-
((uint32_t)toa & kToAMask) << kToAShift | ((uint32_t)data & kDataMask) << kDataShift);
57-
valueToT_ = ((uint32_t)tot & kToTMask) << kToTShift;
58-
}
59-
void print(std::ostream& out = std::cout) {
60-
out << "(row,col) : (" << row() << ',' << column() << ") "
61-
<< "THR: " << threshold() << " Mode: " << mode() << " ToA: " << toa() << " ToT: " << tot()
62-
<< " Data: " << data() << " Raw=0x" << std::hex << raw() << std::dec << std::endl;
63-
}
46+
void setThreshold(bool thr) { setWord(thr, kThreshMask, kThreshShift); }
47+
void setMode(bool mode) { setWord(mode, kModeMask, kModeShift); }
48+
void setColumn(uint8_t col) { setWord(col, kColumnMask, kColumnShift); }
49+
void setRow(uint8_t row) { setWord(row, kRowMask, kRowShift); }
50+
void setToA(uint16_t toa) { setWord(toa, kToAMask, kToAShift); }
51+
void setToT(uint16_t tot) { setWordToT(tot, kToTMask, kToTShift); }
52+
void setData(uint16_t data) { setWord(data, kDataMask, kDataShift); }
53+
void set(bool thr, bool mode, uint16_t toa, uint16_t tot, uint16_t data, uint8_t row, uint8_t col) {
54+
value_ = (((uint32_t)thr & kThreshMask) << kThreshShift | ((uint32_t)mode & kModeMask) << kModeShift |
55+
((uint32_t)col & kColumnMask) << kColumnShift | ((uint32_t)row & kRowMask) << kRowShift |
56+
((uint32_t)toa & kToAMask) << kToAShift | ((uint32_t)data & kDataMask) << kDataShift);
57+
valueToT_ = ((uint32_t)tot & kToTMask) << kToTShift;
58+
}
59+
void print(std::ostream& out = std::cout) {
60+
out << "(row,col) : (" << row() << ',' << column() << ") "
61+
<< "THR: " << threshold() << " Mode: " << mode() << " ToA: " << toa() << " ToT: " << tot()
62+
<< " Data: " << data() << " Raw=0x" << std::hex << raw() << std::dec << std::endl;
63+
}
6464

65-
/**
65+
/**
6666
@short getters
6767
*/
68-
uint32_t raw() const { return value_; }
69-
bool threshold() const { return ((value_ >> kThreshShift) & kThreshMask); }
70-
bool mode() const { return ((value_ >> kModeShift) & kModeMask); }
71-
uint32_t column() const { return ((value_ >> kColumnShift) & kColumnMask); }
72-
uint32_t row() const { return ((value_ >> kRowShift) & kRowMask); }
73-
uint32_t toa() const { return ((value_ >> kToAShift) & kToAMask); }
74-
uint32_t tot() const { return ((valueToT_ >> kToTShift) & kToTMask); }
75-
uint32_t data() const { return ((value_ >> kDataShift) & kDataMask); }
76-
uint32_t operator()() { return value_; }
68+
uint32_t raw() const { return value_; }
69+
bool threshold() const { return ((value_ >> kThreshShift) & kThreshMask); }
70+
bool mode() const { return ((value_ >> kModeShift) & kModeMask); }
71+
uint32_t column() const { return ((value_ >> kColumnShift) & kColumnMask); }
72+
uint32_t row() const { return ((value_ >> kRowShift) & kRowMask); }
73+
uint32_t toa() const { return ((value_ >> kToAShift) & kToAMask); }
74+
uint32_t tot() const { return ((valueToT_ >> kToTShift) & kToTMask); }
75+
uint32_t data() const { return ((value_ >> kDataShift) & kDataMask); }
76+
uint32_t operator()() { return value_; }
7777

78-
private:
79-
/**
78+
private:
79+
/**
8080
@short wrapper to reset words at a given position
8181
*/
82-
void setWord(uint32_t word, uint32_t mask, uint32_t pos) {
83-
//clear required bits
84-
value_ &= ~(mask << pos);
85-
//now set the new value
86-
value_ |= ((word & mask) << pos);
87-
}
82+
void setWord(uint32_t word, uint32_t mask, uint32_t pos) {
83+
//clear required bits
84+
value_ &= ~(mask << pos);
85+
//now set the new value
86+
value_ |= ((word & mask) << pos);
87+
}
8888

89-
void setWordToT(uint32_t word, uint32_t mask, uint32_t pos) {
90-
//clear required bits
91-
valueToT_ &= ~(mask << pos);
92-
//now set the new value
93-
valueToT_ |= ((word & mask) << pos);
94-
}
95-
96-
// a 32-bit word
97-
uint32_t value_;
98-
uint32_t valueToT_;
99-
};
89+
void setWordToT(uint32_t word, uint32_t mask, uint32_t pos) {
90+
//clear required bits
91+
valueToT_ &= ~(mask << pos);
92+
//now set the new value
93+
valueToT_ |= ((word & mask) << pos);
94+
}
10095

96+
// a 32-bit word
97+
uint32_t value_;
98+
uint32_t valueToT_;
99+
};
100+
} // namespace io_v1
101+
using ETLSample = io_v1::ETLSample;
101102
#endif

‎DataFormats/FTLDigi/src/classes_def.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<class name="std::vector<FTLDataFrame>"/>
66
<class name="FTLDigiCollection"/>
77
<class name="edm::Wrapper<FTLDigiCollection>" />
8-
<class name="BTLSample"/>
8+
<class name="io_v1::BTLSample" ClassVersion="3">
9+
<version ClassVersion="3" checksum="2717714428"/>
10+
</class>
911
<class name="std::vector<BTLSample>"/>
10-
<class name="ETLSample" ClassVersion="11">
11-
<version ClassVersion="11" checksum="1290724074"/>
12-
<version ClassVersion="10" checksum="1790811181"/>
12+
<class name="io_v1::ETLSample" ClassVersion="3">
13+
<version ClassVersion="3" checksum="3310437482"/>
1314
</class>
14-
<class name="std::vector<ETLSample>"/>
15+
<class name="std::vector<io_v1::ETLSample>"/>
1516
<class name="BTLDataFrame"/>
1617
<class name="std::vector<BTLDataFrame>"/>
1718
<class name="BTLDigiCollection"/>

0 commit comments

Comments
 (0)