Skip to content

Commit 92eb7e3

Browse files
author
Sven Dildick
committed
Add suffix Bit for Run-3 1/4 and 1/8 strip setters and getters
1 parent b5b66e3 commit 92eb7e3

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎DataFormats/CSCDigi/interface/CSCCLCTDigi.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,16 @@ class CSCCLCTDigi {
102102
void setStrip(const uint16_t strip) { strip_ = strip; }
103103

104104
/// set single quart strip bit
105-
void setQuartStrip(const bool quartStrip) { run3_quart_strip_bit_ = quartStrip; }
105+
void setQuartStripBit(const bool quartStripBit) { run3_quart_strip_bit_ = quartStripBit; }
106106

107107
/// get single quart strip bit
108-
bool getQuartStrip() const { return run3_quart_strip_bit_; }
108+
bool getQuartStripBit() const { return run3_quart_strip_bit_; }
109109

110110
/// set single eighth strip bit
111-
void setEighthStrip(const bool eighthStrip) { run3_eighth_strip_bit_ = eighthStrip; }
111+
void setEighthStripBit(const bool eighthStripBit) { run3_eighth_strip_bit_ = eighthStripBit; }
112112

113113
/// get single eighth strip bit
114-
bool getEighthStrip() const { return run3_eighth_strip_bit_; }
114+
bool getEighthStripBit() const { return run3_eighth_strip_bit_; }
115115

116116
/// return Key CFEB ID
117117
uint16_t getCFEB() const { return cfeb_; }

‎DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ class CSCCorrelatedLCTDigi {
6363
uint16_t getStrip(uint16_t n = 2) const;
6464

6565
/// set single quart strip bit
66-
void setQuartStrip(const bool quartStrip) { run3_quart_strip_bit_ = quartStrip; }
66+
void setQuartStripBit(const bool quartStripBit) { run3_quart_strip_bit_ = quartStripBit; }
6767

6868
/// get single quart strip bit
69-
bool getQuartStrip() const { return run3_quart_strip_bit_; }
69+
bool getQuartStripBit() const { return run3_quart_strip_bit_; }
7070

7171
/// set single eighth strip bit
72-
void setEighthStrip(const bool eighthStrip) { run3_eighth_strip_bit_ = eighthStrip; }
72+
void setEighthStripBit(const bool eighthStripBit) { run3_eighth_strip_bit_ = eighthStripBit; }
7373

7474
/// get single eighth strip bit
75-
bool getEighthStrip() const { return run3_eighth_strip_bit_; }
75+
bool getEighthStripBit() const { return run3_eighth_strip_bit_; }
7676

7777
/*
7878
Strips are numbered starting from 1 in CMSSW

‎DataFormats/CSCDigi/src/CSCCLCTDigi.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ float CSCCLCTDigi::getFractionalSlope() const {
9999
uint16_t CSCCLCTDigi::getKeyStrip(const uint16_t n) const {
100100
// 10-bit case for strip data word
101101
if (compCode_ != -1 and n == 8) {
102-
return getKeyStrip(4) * 2 + getEighthStrip();
102+
return getKeyStrip(4) * 2 + getEighthStripBit();
103103
}
104104
// 9-bit case for strip data word
105105
else if (compCode_ != -1 and n == 4) {
106-
return getKeyStrip(2) * 2 + getQuartStrip();
106+
return getKeyStrip(2) * 2 + getQuartStripBit();
107107
}
108108
// 8-bit case for strip data word (all other cases)
109109
else {

‎DataFormats/CSCDigi/src/CSCCorrelatedLCTDigi.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ void CSCCorrelatedLCTDigi::clear() {
8383
uint16_t CSCCorrelatedLCTDigi::getStrip(const uint16_t n) const {
8484
// all 10 bits
8585
if (n == 8) {
86-
return 2 * getStrip(4) + getEighthStrip();
86+
return 2 * getStrip(4) + getEighthStripBit();
8787
}
8888
// lowest 9 bits
8989
else if (n == 4) {
90-
return 2 * getStrip(2) + getQuartStrip();
90+
return 2 * getStrip(2) + getQuartStripBit();
9191
}
9292
// lowest 8 bits
9393
else {

‎L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@ void CSCCathodeLCTProcessor::runCCLUT(CSCCLCTDigi& digi) const {
13351335
strm << "+ Before CCCLUT algorithm: +\n";
13361336
strm << "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
13371337
strm << " Old CLCT digi " << digi << "\n";
1338-
strm << " 1/4 strip bit " << digi.getQuartStrip() << " 1/8 strip bit " << digi.getEighthStrip() << "\n";
1338+
strm << " 1/4 strip bit " << digi.getQuartStripBit() << " 1/8 strip bit " << digi.getEighthStripBit() << "\n";
13391339
strm << " 1/4 strip number " << digi.getKeyStrip(4) << " 1/8 strip number " << digi.getKeyStrip(8) << "\n";
13401340
strm << "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
13411341
LogDebug("CSCCathodeLCTProcessor") << strm.str();
@@ -1411,8 +1411,8 @@ void CSCCathodeLCTProcessor::runCCLUT(CSCCLCTDigi& digi) const {
14111411

14121412
// store the new 1/2, 1/4 and 1/8 strip positions
14131413
digi.setStrip(halfstrip - digi.getCFEB() * CSCConstants::NUM_HALF_STRIPS_PER_CFEB);
1414-
digi.setQuartStrip(std::get<1>(stripoffset));
1415-
digi.setEighthStrip(std::get<2>(stripoffset));
1414+
digi.setQuartStripBit(std::get<1>(stripoffset));
1415+
digi.setEighthStripBit(std::get<2>(stripoffset));
14161416

14171417
// store the bending angle value in the pattern data member
14181418
digi.setSlope(slopeCCValue);
@@ -1428,7 +1428,7 @@ void CSCCathodeLCTProcessor::runCCLUT(CSCCLCTDigi& digi) const {
14281428
strm << "+ CCCLUT algorithm results: +\n";
14291429
strm << "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
14301430
strm << " New CLCT digi " << digi << "\n";
1431-
strm << " 1/4 strip bit " << digi.getQuartStrip() << " 1/8 strip bit " << digi.getEighthStrip() << "\n";
1431+
strm << " 1/4 strip bit " << digi.getQuartStripBit() << " 1/8 strip bit " << digi.getEighthStripBit() << "\n";
14321432
strm << " 1/4 strip number " << digi.getKeyStrip(4) << " 1/8 strip number " << digi.getKeyStrip(8) << "\n";
14331433
strm << "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
14341434
LogDebug("CSCCathodeLCTProcessor") << strm.str();

‎L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ CSCCorrelatedLCTDigi CSCGEMMotherboard::constructLCTsGEM(const CSCALCTDigi& alct
145145
thisLCT.setRun3(true);
146146
// 4-bit slope value derived with the CCLUT algorithm
147147
thisLCT.setSlope(clct.getSlope());
148-
thisLCT.setQuartStrip(clct.getQuartStrip());
149-
thisLCT.setEighthStrip(clct.getEighthStrip());
148+
thisLCT.setQuartStripBit(clct.getQuartStripBit());
149+
thisLCT.setEighthStripBit(clct.getEighthStripBit());
150150
thisLCT.setRun3Pattern(clct.getRun3Pattern());
151151
}
152152
} else if (alct.isValid() and clct.isValid() and not gem1.isValid() and gem2.isValid()) {
@@ -170,8 +170,8 @@ CSCCorrelatedLCTDigi CSCGEMMotherboard::constructLCTsGEM(const CSCALCTDigi& alct
170170
thisLCT.setRun3(true);
171171
// 4-bit slope value derived with the CCLUT algorithm
172172
thisLCT.setSlope(clct.getSlope());
173-
thisLCT.setQuartStrip(clct.getQuartStrip());
174-
thisLCT.setEighthStrip(clct.getEighthStrip());
173+
thisLCT.setQuartStripBit(clct.getQuartStripBit());
174+
thisLCT.setEighthStripBit(clct.getEighthStripBit());
175175
thisLCT.setRun3Pattern(clct.getRun3Pattern());
176176
}
177177
} else if (alct.isValid() and gem2.isValid() and not clct.isValid()) {
@@ -244,8 +244,8 @@ CSCCorrelatedLCTDigi CSCGEMMotherboard::constructLCTsGEM(const CSCALCTDigi& alct
244244
thisLCT.setRun3(true);
245245
// 4-bit slope value derived with the CCLUT algorithm
246246
thisLCT.setSlope(clct.getSlope());
247-
thisLCT.setQuartStrip(clct.getQuartStrip());
248-
thisLCT.setEighthStrip(clct.getEighthStrip());
247+
thisLCT.setQuartStripBit(clct.getQuartStripBit());
248+
thisLCT.setEighthStripBit(clct.getEighthStripBit());
249249
thisLCT.setRun3Pattern(clct.getRun3Pattern());
250250
}
251251
}

‎L1Trigger/CSCTriggerPrimitives/src/CSCMotherboard.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ CSCCorrelatedLCTDigi CSCMotherboard::constructLCTs(const CSCALCTDigi& aLCT,
420420
thisLCT.setRun3(true);
421421
// 4-bit slope value derived with the CCLUT algorithm
422422
thisLCT.setSlope(cLCT.getSlope());
423-
thisLCT.setQuartStrip(cLCT.getQuartStrip());
424-
thisLCT.setEighthStrip(cLCT.getEighthStrip());
423+
thisLCT.setQuartStripBit(cLCT.getQuartStripBit());
424+
thisLCT.setEighthStripBit(cLCT.getEighthStripBit());
425425
thisLCT.setRun3Pattern(cLCT.getRun3Pattern());
426426
}
427427

0 commit comments

Comments
 (0)