Skip to content

Commit

Permalink
fixing default parameters for all qie8 data frames
Browse files Browse the repository at this point in the history
  • Loading branch information
vkhristenko committed May 30, 2018
1 parent dc81c73 commit 6cc610f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions DataFormats/HcalDigi/interface/HBHEDataFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class HBHEDataFrame {
}

/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample, int nSamples) const {
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++) {
Expand All @@ -71,7 +71,7 @@ class HBHEDataFrame {
hcalPresamples_|=ps&0xF;
}
constexpr void setZSInfo(bool unsuppressed, bool markAndPass,
uint32_t crossingMask) {
uint32_t crossingMask=0) {
hcalPresamples_&=0x7FC00F0F; // preserve actual presamples and fiber idle offset
if (markAndPass) hcalPresamples_|=0x10;
if (unsuppressed) hcalPresamples_|=0x20;
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/HcalDigi/interface/HFDataFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class HFDataFrame {
}

/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample, int nSamples) const {
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++) {
Expand All @@ -70,7 +70,7 @@ class HFDataFrame {
hcalPresamples_|=ps&0xF;
}
constexpr void setZSInfo(bool unsuppressed, bool markAndPass,
uint32_t crossingMask) {
uint32_t crossingMask=0) {
hcalPresamples_&=0x7FC00F0F; // preserve actual presamples and fiber idle offset
if (markAndPass) hcalPresamples_|=0x10;
if (unsuppressed) hcalPresamples_|=0x20;
Expand Down
4 changes: 2 additions & 2 deletions DataFormats/HcalDigi/interface/HODataFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class HODataFrame {
}

/// validate appropriate DV and ER bits as well as capid rotation for the specified samples (default is all)
constexpr bool validate(int firstSample, int nSamples) const {
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++) {
Expand All @@ -70,7 +70,7 @@ class HODataFrame {
constexpr void setPresamples(int ps) {
hcalPresamples_|=ps&0xF;
}
constexpr void setZSInfo(bool unsuppressed, bool markAndPass, uint32_t crossingMask) {
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;
Expand Down

0 comments on commit 6cc610f

Please sign in to comment.