Skip to content
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

Jump to bottom

Fix out-of-bound issue in call to LUT in GEM-CSC trigger #30564

Merged
merged 4 commits into from Jul 9, 2020
Merged

Fix out-of-bound issue in call to LUT in GEM-CSC trigger #30564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7f29b6
Bugfix
Jul 6, 2020
644ec19
Code format
Jul 6, 2020
aa59860
Add more comments
Jul 6, 2020
d08b6a0
Suggestion by Andrea Bocci
Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboard.h
View file
Open in desktop
Expand Up @@ -200,6 +200,8 @@ class CSCGEMMotherboard : public CSCUpgradeMotherboard {

/** Chamber id (trigger-type labels). */
unsigned gemId;
int maxPads() const;
int maxRolls() const;

const GEMGeometry* gem_g;
bool gemGeometryAvailable;
Expand Down
33 changes: 25 additions & 8 deletions L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.cc
View file
Open in desktop
Expand Up @@ -144,20 +144,28 @@ CSCCorrelatedLCTDigi CSCGEMMotherboard::constructLCTsGEM(const CSCALCTDigi& alct
p = CSCPart::ME1A;
}

// min pad number is always 0
// max pad number is 191 or 383, depending on the station
assert(gem2.pad(1) >= 0);
assert(gem2.pad(2) >= 0);
assert(gem2.pad(1) < maxPads());
assert(gem2.pad(2) < maxPads());

const auto& mymap1 = getLUT()->get_gem_pad_to_csc_hs(theParity, p);
// GEM pad number is counting from 1
// keyStrip from mymap: for ME1b 0-127 and for ME1a 0-95
// keyStrip for CLCT: for ME1b 0-127 and for ME1a 128-223
keyStrip = mymap1[gem2.pad(2) - 1];
if (p == CSCPart::ME1A and keyStrip <= CSCConstants::MAX_HALF_STRIP_ME1B)
keyStrip = mymap1.at(gem2.pad(2));
if (p == CSCPart::ME1A and keyStrip <= CSCConstants::MAX_HALF_STRIP_ME1B) {
keyStrip += CSCConstants::MAX_HALF_STRIP_ME1B + 1;
}
keyWG = alct.getKeyWG();

if ((not doesWiregroupCrossStrip(keyWG, keyStrip)) and p == CSCPart::ME1B and keyWG <= 15) {
//try ME1A as strip and WG do not cross
p = CSCPart::ME1A;
const auto& mymap2 = getLUT()->get_gem_pad_to_csc_hs(theParity, p);
keyStrip = mymap2[gem2.pad(2) - 1] + CSCConstants::MAX_HALF_STRIP_ME1B + 1;
keyStrip = mymap2.at(gem2.pad(2)) + CSCConstants::MAX_HALF_STRIP_ME1B + 1;
}

pattern = promoteALCTGEMpattern_ ? 10 : 0;
Expand All @@ -169,13 +177,18 @@ CSCCorrelatedLCTDigi CSCGEMMotherboard::constructLCTsGEM(const CSCALCTDigi& alct
thisLCT.setType(CSCCorrelatedLCTDigi::ALCT2GEM);
valid = true;
} else if (clct.isValid() and gem2.isValid() and not alct.isValid()) {
// min roll number is always 1
// max roll number is 8 or 16, depending on the station
assert(gem2.roll() >= GEMDetId::minRollId);
assert(gem2.roll() <= maxRolls());

const auto& mymap2 = getLUT()->get_gem_roll_to_csc_wg(theParity);
pattern = encodePattern(clct.getPattern());
quality = promoteCLCTGEMquality_ ? 15 : 11;
bx = gem2.bx(1) + CSCConstants::LCT_CENTRAL_BX;
keyStrip = clct.getKeyStrip();
// choose the corresponding wire-group in the middle of the partition
keyWG = mymap2[gem2.roll() - 1];
keyWG = mymap2.at(gem2.roll() - 1);
bend = clct.getBend();
thisLCT.setCLCT(clct);
thisLCT.setGEM1(gem2.first());
Expand Down Expand Up @@ -222,7 +235,7 @@ bool CSCGEMMotherboard::isPadInOverlap(int roll) const {
// overlap region are WGs 10-15
if ((i < 10) or (i > 15))
continue;
if ((mymap[i].first <= roll) and (roll <= mymap[i].second))
if ((mymap.at(i).first <= roll) and (roll <= mymap.at(i).second))
return true;
}
return false;
Expand All @@ -241,8 +254,8 @@ int CSCGEMMotherboard::getRoll(const GEMPadDigiId& p) const { return GEMDetId(p.
int CSCGEMMotherboard::getRoll(const GEMCoPadDigiId& p) const { return p.second.roll(); }

std::pair<int, int> CSCGEMMotherboard::getRolls(const CSCALCTDigi& alct) const {
return std::make_pair((getLUT()->get_csc_wg_to_gem_roll(theParity))[alct.getKeyWG()].first,
(getLUT()->get_csc_wg_to_gem_roll(theParity))[alct.getKeyWG()].second);
const auto& mymap(getLUT()->get_csc_wg_to_gem_roll(theParity));
return mymap.at(alct.getKeyWG());
}

float CSCGEMMotherboard::getPad(const GEMPadDigi& p) const { return p.pad(); }
Expand All @@ -258,14 +271,18 @@ float CSCGEMMotherboard::getPad(const CSCCLCTDigi& clct, enum CSCPart part) cons
//ME1A part, convert halfstrip from 128-223 to 0-95
if (part == CSCPart::ME1A and keyStrip > CSCConstants::MAX_HALF_STRIP_ME1B)
keyStrip = keyStrip - CSCConstants::MAX_HALF_STRIP_ME1B - 1;
return 0.5 * (mymap[keyStrip].first + mymap[keyStrip].second);
return 0.5 * (mymap.at(keyStrip).first + mymap.at(keyStrip).second);
}

void CSCGEMMotherboard::setupGeometry() {
CSCUpgradeMotherboard::setupGeometry();
generator_->setGEMGeometry(gem_g);
}

int CSCGEMMotherboard::maxPads() const { return gem_g->superChamber(gemId)->chamber(1)->etaPartition(1)->npads(); }

int CSCGEMMotherboard::maxRolls() const { return gem_g->superChamber(gemId)->chamber(1)->nEtaPartitions(); }

void CSCGEMMotherboard::printGEMTriggerPads(int bx_start, int bx_stop, enum CSCPart part) {
LogTrace("CSCGEMMotherboard") << "------------------------------------------------------------------------"
<< std::endl;
Expand Down