Skip to content

[EVO] Moved HcalDigi products to versioned namespace #50325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Mar 7, 2026
Merged

[EVO] Moved HcalDigi products to versioned namespace #50325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 84 additions & 82 deletions DataFormats/HcalDigi/interface/HBHEDataFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,97 +11,99 @@
Precision readout digi for HB and HE.

*/
class HBHEDataFrame {
public:
typedef HcalDetId key_type; ///< For the sorted collection
namespace io_v1 {
class HBHEDataFrame {
public:
typedef HcalDetId key_type; ///< For the sorted collection

constexpr HBHEDataFrame() : id_(0), size_(0), hcalPresamples_(0) {}
constexpr explicit HBHEDataFrame(const HcalDetId& id) : id_(id), size_(0), hcalPresamples_(0) {
// TODO : test id for HcalBarrel or HcalEndcap
}

constexpr const HcalDetId& id() const { return id_; }
constexpr const HcalElectronicsId& elecId() const { return electronicsId_; }
constexpr HBHEDataFrame() : id_(0), size_(0), hcalPresamples_(0) {}
constexpr explicit HBHEDataFrame(const HcalDetId& id) : id_(id), size_(0), hcalPresamples_(0) {
// TODO : test id for HcalBarrel or HcalEndcap
}

/// total number of samples in the digi
constexpr int size() const { return size_ & 0xF; }
/// number of samples before the sample from the triggered beam crossing (according to the hardware)
constexpr int presamples() const { return hcalPresamples_ & 0xF; }
/// was ZS MarkAndPass?
constexpr bool zsMarkAndPass() const { return (hcalPresamples_ & 0x10); }
/// was ZS unsuppressed?
constexpr bool zsUnsuppressed() const { return (hcalPresamples_ & 0x20); }
/// zs crossing mask (which sums considered)
constexpr uint32_t zsCrossingMask() const { return (hcalPresamples_ & 0x3FF000) >> 12; }
constexpr const HcalDetId& id() const { return id_; }
constexpr const HcalElectronicsId& elecId() const { return electronicsId_; }

/// access a sample
constexpr HcalQIESample const& operator[](int i) const { return data_[i]; }
/// access a sample
constexpr HcalQIESample const& sample(int i) const { return data_[i]; }
/// total number of samples in the digi
constexpr int size() const { return size_ & 0xF; }
/// number of samples before the sample from the triggered beam crossing (according to the hardware)
constexpr int presamples() const { return hcalPresamples_ & 0xF; }
/// was ZS MarkAndPass?
constexpr bool zsMarkAndPass() const { return (hcalPresamples_ & 0x10); }
/// was ZS unsuppressed?
constexpr bool zsUnsuppressed() const { return (hcalPresamples_ & 0x20); }
/// zs crossing mask (which sums considered)
constexpr uint32_t zsCrossingMask() const { return (hcalPresamples_ & 0x3FF000) >> 12; }

/// offset of bunch number for this channel relative to nominal set in the unpacker (range is +7->-7. -1000 indicates the data is invalid/unavailable)
constexpr int fiberIdleOffset() const {
int val = (hcalPresamples_ & 0xF00) >> 8;
return (val == 0) ? (-1000) : (((val & 0x8) == 0) ? (-(val & 0x7)) : (val & 0x7));
}
/// access a sample
constexpr HcalQIESample const& operator[](int i) const { return data_[i]; }
/// access a sample
constexpr HcalQIESample const& sample(int i) const { return data_[i]; }

/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample = 0, int nSamples = 100) const {
int capid = -1;
bool ok = true;
for (int i = 0; ok && i < nSamples && i + firstSample < size_; i++) {
if (data_[i + firstSample].er() || !data_[i + firstSample].dv())
ok = false;
if (i == 0)
capid = data_[i + firstSample].capid();
if (capid != data_[i + firstSample].capid())
ok = false;
capid = (capid + 1) % 4;
/// offset of bunch number for this channel relative to nominal set in the unpacker (range is +7->-7. -1000 indicates the data is invalid/unavailable)
constexpr int fiberIdleOffset() const {
int val = (hcalPresamples_ & 0xF00) >> 8;
return (val == 0) ? (-1000) : (((val & 0x8) == 0) ? (-(val & 0x7)) : (val & 0x7));
}
return ok;
}

constexpr void setSize(int size) {
if (size > MAXSAMPLES)
size_ = MAXSAMPLES;
else if (size <= 0)
size_ = 0;
else
size_ = size;
}
constexpr void setPresamples(int ps) { hcalPresamples_ |= ps & 0xF; }
constexpr void setZSInfo(bool unsuppressed, bool markAndPass, uint32_t crossingMask = 0) {
hcalPresamples_ &= 0x7FC00F0F; // preserve actual presamples and fiber idle offset
if (markAndPass)
hcalPresamples_ |= 0x10;
if (unsuppressed)
hcalPresamples_ |= 0x20;
hcalPresamples_ |= (crossingMask & 0x3FF) << 12;
}
constexpr void setSample(int i, const HcalQIESample& sam) { data_[i] = sam; }
constexpr void setReadoutIds(const HcalElectronicsId& eid) { electronicsId_ = eid; }
constexpr void setFiberIdleOffset(int offset) {
hcalPresamples_ &= 0x7FFFF0FF;
if (offset >= 7)
hcalPresamples_ |= 0xF00;
else if (offset >= 0)
hcalPresamples_ |= (0x800) | (offset << 8);
else if (offset >= -7)
hcalPresamples_ |= ((-offset) << 8);
else
hcalPresamples_ |= 0x700;
}
/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample = 0, int nSamples = 100) const {
int capid = -1;
bool ok = true;
for (int i = 0; ok && i < nSamples && i + firstSample < size_; i++) {
if (data_[i + firstSample].er() || !data_[i + firstSample].dv())
ok = false;
if (i == 0)
capid = data_[i + firstSample].capid();
if (capid != data_[i + firstSample].capid())
ok = false;
capid = (capid + 1) % 4;
}
return ok;
}

static const int MAXSAMPLES = 10;
constexpr void setSize(int size) {
if (size > MAXSAMPLES)
size_ = MAXSAMPLES;
else if (size <= 0)
size_ = 0;
else
size_ = size;
}
constexpr void setPresamples(int ps) { hcalPresamples_ |= ps & 0xF; }
constexpr void setZSInfo(bool unsuppressed, bool markAndPass, uint32_t crossingMask = 0) {
hcalPresamples_ &= 0x7FC00F0F; // preserve actual presamples and fiber idle offset
if (markAndPass)
hcalPresamples_ |= 0x10;
if (unsuppressed)
hcalPresamples_ |= 0x20;
hcalPresamples_ |= (crossingMask & 0x3FF) << 12;
}
constexpr void setSample(int i, const HcalQIESample& sam) { data_[i] = sam; }
constexpr void setReadoutIds(const HcalElectronicsId& eid) { electronicsId_ = eid; }
constexpr void setFiberIdleOffset(int offset) {
hcalPresamples_ &= 0x7FFFF0FF;
if (offset >= 7)
hcalPresamples_ |= 0xF00;
else if (offset >= 0)
hcalPresamples_ |= (0x800) | (offset << 8);
else if (offset >= -7)
hcalPresamples_ |= ((-offset) << 8);
else
hcalPresamples_ |= 0x700;
}

private:
HcalDetId id_;
HcalElectronicsId electronicsId_;
int size_;
int hcalPresamples_;
HcalQIESample data_[MAXSAMPLES];
};
static const int MAXSAMPLES = 10;

std::ostream& operator<<(std::ostream&, const HBHEDataFrame&);
private:
HcalDetId id_;
HcalElectronicsId electronicsId_;
int size_;
int hcalPresamples_;
HcalQIESample data_[MAXSAMPLES];
};

std::ostream& operator<<(std::ostream&, const HBHEDataFrame&);
} // namespace io_v1
using HBHEDataFrame = io_v1::HBHEDataFrame;
#endif
5 changes: 4 additions & 1 deletion DataFormats/HcalDigi/interface/HBHEDataFrameFwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#ifndef DataFormats_HcalDigi_HBHEDataFrameFwd_h
#define DataFormats_HcalDigi_HBHEDataFrameFwd_h

class HBHEDataFrame;
namespace io_v1 {
class HBHEDataFrame;
}
using HBHEDataFrame = io_v1::HBHEDataFrame;

#endif
166 changes: 84 additions & 82 deletions DataFormats/HcalDigi/interface/HFDataFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,97 +11,99 @@
Precision readout digi for HF

*/
class HFDataFrame {
public:
typedef HcalDetId key_type; ///< For the sorted collection
namespace io_v1 {
class HFDataFrame {
public:
typedef HcalDetId key_type; ///< For the sorted collection

constexpr HFDataFrame() : id_(0), size_(0), hcalPresamples_(0) {}
constexpr explicit HFDataFrame(const HcalDetId& id)
: id_(id), size_(0), hcalPresamples_(0) { // TODO : test id for HcalForward
}

constexpr HcalDetId const& id() const { return id_; }
constexpr HcalElectronicsId const& elecId() const { return electronicsId_; }
constexpr HFDataFrame() : id_(0), size_(0), hcalPresamples_(0) {}
constexpr explicit HFDataFrame(const HcalDetId& id)
: id_(id), size_(0), hcalPresamples_(0) { // TODO : test id for HcalForward
}

/// total number of samples in the digi
constexpr int size() const { return size_ & 0xF; }
/// number of samples before the sample from the triggered beam crossing (according to the hardware)
constexpr int presamples() const { return hcalPresamples_ & 0xF; }
/// was ZS MarkAndPass?
constexpr bool zsMarkAndPass() const { return (hcalPresamples_ & 0x10); }
/// was ZS unsuppressed?
constexpr bool zsUnsuppressed() const { return (hcalPresamples_ & 0x20); }
/// zs crossing mask (which sums considered)
constexpr uint32_t zsCrossingMask() const { return (hcalPresamples_ & 0x3FF000) >> 12; }
constexpr HcalDetId const& id() const { return id_; }
constexpr HcalElectronicsId const& elecId() const { return electronicsId_; }

/// access a sample
constexpr HcalQIESample const& operator[](int i) const { return data_[i]; }
/// access a sample
constexpr HcalQIESample const& sample(int i) const { return data_[i]; }
/// total number of samples in the digi
constexpr int size() const { return size_ & 0xF; }
/// number of samples before the sample from the triggered beam crossing (according to the hardware)
constexpr int presamples() const { return hcalPresamples_ & 0xF; }
/// was ZS MarkAndPass?
constexpr bool zsMarkAndPass() const { return (hcalPresamples_ & 0x10); }
/// was ZS unsuppressed?
constexpr bool zsUnsuppressed() const { return (hcalPresamples_ & 0x20); }
/// zs crossing mask (which sums considered)
constexpr uint32_t zsCrossingMask() const { return (hcalPresamples_ & 0x3FF000) >> 12; }

/// offset of bunch number for this channel relative to nominal set in the unpacker (range is +7->-7. -1000 indicates the data is invalid/unavailable)
constexpr int fiberIdleOffset() const {
int val = (hcalPresamples_ & 0xF00) >> 8;
return (val == 0) ? (-1000) : (((val & 0x8) == 0) ? (-(val & 0x7)) : (val & 0x7));
}
/// access a sample
constexpr HcalQIESample const& operator[](int i) const { return data_[i]; }
/// access a sample
constexpr HcalQIESample const& sample(int i) const { return data_[i]; }

/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample = 0, int nSamples = 100) const {
int capid = -1;
bool ok = true;
for (int i = 0; ok && i < nSamples && i + firstSample < size_; i++) {
if (data_[i + firstSample].er() || !data_[i + firstSample].dv())
ok = false;
if (i == 0)
capid = data_[i + firstSample].capid();
if (capid != data_[i + firstSample].capid())
ok = false;
capid = (capid + 1) % 4;
/// offset of bunch number for this channel relative to nominal set in the unpacker (range is +7->-7. -1000 indicates the data is invalid/unavailable)
constexpr int fiberIdleOffset() const {
int val = (hcalPresamples_ & 0xF00) >> 8;
return (val == 0) ? (-1000) : (((val & 0x8) == 0) ? (-(val & 0x7)) : (val & 0x7));
}
return ok;
}

constexpr void setSize(int size) {
if (size > MAXSAMPLES)
size_ = MAXSAMPLES;
else if (size <= 0)
size_ = 0;
else
size_ = size;
}
constexpr void setPresamples(int ps) { hcalPresamples_ |= ps & 0xF; }
constexpr void setZSInfo(bool unsuppressed, bool markAndPass, uint32_t crossingMask = 0) {
hcalPresamples_ &= 0x7FC00F0F; // preserve actual presamples and fiber idle offset
if (markAndPass)
hcalPresamples_ |= 0x10;
if (unsuppressed)
hcalPresamples_ |= 0x20;
hcalPresamples_ |= (crossingMask & 0x3FF) << 12;
}
constexpr void setSample(int i, const HcalQIESample& sam) { data_[i] = sam; }
constexpr void setReadoutIds(const HcalElectronicsId& eid) { electronicsId_ = eid; }
constexpr void setFiberIdleOffset(int offset) {
hcalPresamples_ &= 0x7FFFF0FF;
if (offset >= 7)
hcalPresamples_ |= 0xF00;
else if (offset >= 0)
hcalPresamples_ |= (0x800) | (offset << 8);
else if (offset >= -7)
hcalPresamples_ |= ((-offset) << 8);
else
hcalPresamples_ |= 0x700;
}
/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample = 0, int nSamples = 100) const {
int capid = -1;
bool ok = true;
for (int i = 0; ok && i < nSamples && i + firstSample < size_; i++) {
if (data_[i + firstSample].er() || !data_[i + firstSample].dv())
ok = false;
if (i == 0)
capid = data_[i + firstSample].capid();
if (capid != data_[i + firstSample].capid())
ok = false;
capid = (capid + 1) % 4;
}
return ok;
}

static const int MAXSAMPLES = 10;
constexpr void setSize(int size) {
if (size > MAXSAMPLES)
size_ = MAXSAMPLES;
else if (size <= 0)
size_ = 0;
else
size_ = size;
}
constexpr void setPresamples(int ps) { hcalPresamples_ |= ps & 0xF; }
constexpr void setZSInfo(bool unsuppressed, bool markAndPass, uint32_t crossingMask = 0) {
hcalPresamples_ &= 0x7FC00F0F; // preserve actual presamples and fiber idle offset
if (markAndPass)
hcalPresamples_ |= 0x10;
if (unsuppressed)
hcalPresamples_ |= 0x20;
hcalPresamples_ |= (crossingMask & 0x3FF) << 12;
}
constexpr void setSample(int i, const HcalQIESample& sam) { data_[i] = sam; }
constexpr void setReadoutIds(const HcalElectronicsId& eid) { electronicsId_ = eid; }
constexpr void setFiberIdleOffset(int offset) {
hcalPresamples_ &= 0x7FFFF0FF;
if (offset >= 7)
hcalPresamples_ |= 0xF00;
else if (offset >= 0)
hcalPresamples_ |= (0x800) | (offset << 8);
else if (offset >= -7)
hcalPresamples_ |= ((-offset) << 8);
else
hcalPresamples_ |= 0x700;
}

private:
HcalDetId id_;
HcalElectronicsId electronicsId_;
int size_;
int hcalPresamples_;
HcalQIESample data_[MAXSAMPLES];
};
static const int MAXSAMPLES = 10;

std::ostream& operator<<(std::ostream&, const HFDataFrame&);
private:
HcalDetId id_;
HcalElectronicsId electronicsId_;
int size_;
int hcalPresamples_;
HcalQIESample data_[MAXSAMPLES];
};

std::ostream& operator<<(std::ostream&, const HFDataFrame&);
} // namespace io_v1
using HFDataFrame = io_v1::HFDataFrame;
#endif
6 changes: 4 additions & 2 deletions DataFormats/HcalDigi/interface/HFDataFrameFwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef DataFormats_HcalDigi_HFDataFrameFwd_h
#define DataFormats_HcalDigi_HFDataFrameFwd_h

class HFDataFrame;

namespace io_v1 {
class HFDataFrame;
}
using HFDataFrame = io_v1::HFDataFrame;
#endif
Loading