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

L1T EMTF fix for pT assignment configuration bug in 2016 and 2017 #29080

Merged
merged 3 commits into from Mar 17, 2020
Merged

L1T EMTF fix for pT assignment configuration bug in 2016 and 2017 #29080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa01ea6
Enable EMTF configuration by global "Era" parameter
abrinke1 Mar 3, 2020
236878f
EMTF remove spurious warnings in 2016 PtAssignment.cc
abrinke1 Mar 3, 2020
64e9f11
EMTF remove spurious warnings in 2016 PtAssignment.cc with code style…
abrinke1 Mar 3, 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
12 changes: 8 additions & 4 deletions L1Trigger/L1TMuonEndCap/python/simEmtfDigis_cfi.py
View file
Open in desktop
Expand Up @@ -131,10 +131,14 @@
simEmtfDigis = simEmtfDigisMC.clone()


## Load "Era" modules to adjust RPCEnable and Era (which controls the choice of PtAssignmentEngine)
## If neither 'Run2_2016' nor 'Run2_2017' are invoked, default 2018 settings are used
## Era configuration files are located in Configuration/Eras/python

## Era: Run2_2016
#from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
#stage2L1Trigger.toModify(simEmtfDigis, RPCEnable = cms.bool(False), Era = cms.string('Run2_2016'))
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(simEmtfDigis, RPCEnable = cms.bool(False), Era = cms.string('Run2_2016'))

## Era: Run2_2017
#from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
#stage2L1Trigger_2017.toModify(simEmtfDigis, RPCEnable = cms.bool(True), Era = cms.string('Run2_2017'))
from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
stage2L1Trigger_2017.toModify(simEmtfDigis, RPCEnable = cms.bool(True), Era = cms.string('Run2_2017'))
5 changes: 3 additions & 2 deletions L1Trigger/L1TMuonEndCap/src/PtAssignment.cc
View file
Open in desktop
Expand Up @@ -73,8 +73,9 @@ void PtAssignment::process(EMTFTrackCollection& best_tracks) {
address = pt_assign_engine_->calculate_address(track);
xmlpt = pt_assign_engine_->calculate_pt(address);

// Check address packing / unpacking
if (not(fabs(xmlpt - pt_assign_engine_->calculate_pt(track)) < 0.001)) {
// Check address packing / unpacking using PtAssignmentEngine2017::calculate_pt_xml(const EMTFTrack& track)
if (pt_assign_engine_->get_pt_lut_version() > 5 &&
not(fabs(xmlpt - pt_assign_engine_->calculate_pt(track)) < 0.001)) {
edm::LogWarning("L1T") << "EMTF pT assignment mismatch: xmlpt = " << xmlpt
<< ", pt_assign_engine_->calculate_pt(track)) = "
<< pt_assign_engine_->calculate_pt(track);
Expand Down