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.

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

[Backport] Updates related to the L1 menu v1_1_0 for the start of Run 3 #38331

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion L1Trigger/Configuration/python/customiseUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def L1TGlobalDigisSummary(process):
def L1TGlobalMenuXML(process):
process.load('L1Trigger.L1TGlobal.GlobalParameters_cff')
process.load('L1Trigger.L1TGlobal.TriggerMenu_cff')
process.TriggerMenu.L1TriggerMenuFile = cms.string('L1Menu_Collisions2022_v1_0_0.xml')
process.TriggerMenu.L1TriggerMenuFile = cms.string('L1Menu_Collisions2022_v1_1_0.xml')
return process

def L1TGlobalSimDigisSummary(process):
Expand Down
8 changes: 4 additions & 4 deletions L1Trigger/L1TGlobal/python/PrescalesVetosFract_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
TriggerMenuLuminosity = cms.string('startup'),
Verbosity = cms.int32(0),
AlgoBxMaskDefault = cms.int32(1),
PrescaleXMLFile = cms.string('UGT_BASE_RS_PRESCALES_L1MenuCollisions2022_v1_0_0.xml'),
AlgoBxMaskXMLFile = cms.string('UGT_BASE_RS_ALGOBX_MASK_L1MenuCollisions2022_v1_0_0.xml'),
FinOrMaskXMLFile = cms.string('UGT_BASE_RS_FINOR_MASK_L1MenuCollisions2022_v1_0_0.xml'),
VetoMaskXMLFile = cms.string('UGT_BASE_RS_VETO_MASK_L1MenuCollisions2022_v1_0_0.xml'),
PrescaleXMLFile = cms.string('UGT_BASE_RS_PRESCALES_L1MenuCollisions2022_v1_1_0.xml'),
AlgoBxMaskXMLFile = cms.string('UGT_BASE_RS_ALGOBX_MASK_L1MenuCollisions2022_v1_1_0.xml'),
FinOrMaskXMLFile = cms.string('UGT_BASE_RS_FINOR_MASK_L1MenuCollisions2022_v1_1_0.xml'),
VetoMaskXMLFile = cms.string('UGT_BASE_RS_VETO_MASK_L1MenuCollisions2022_v1_1_0.xml'),
)
8 changes: 4 additions & 4 deletions L1Trigger/L1TGlobal/python/PrescalesVetos_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
TriggerMenuLuminosity = cms.string('startup'),
Verbosity = cms.int32(0),
AlgoBxMaskDefault = cms.int32(1),
PrescaleXMLFile = cms.string('UGT_BASE_RS_PRESCALES_L1MenuCollisions2022_v1_0_0.xml'),
AlgoBxMaskXMLFile = cms.string('UGT_BASE_RS_ALGOBX_MASK_L1MenuCollisions2022_v1_0_0.xml'),
FinOrMaskXMLFile = cms.string('UGT_BASE_RS_FINOR_MASK_L1MenuCollisions2022_v1_0_0.xml'),
VetoMaskXMLFile = cms.string('UGT_BASE_RS_VETO_MASK_L1MenuCollisions2022_v1_0_0.xml'),
PrescaleXMLFile = cms.string('UGT_BASE_RS_PRESCALES_L1MenuCollisions2022_v1_1_0.xml'),
AlgoBxMaskXMLFile = cms.string('UGT_BASE_RS_ALGOBX_MASK_L1MenuCollisions2022_v1_1_0.xml'),
FinOrMaskXMLFile = cms.string('UGT_BASE_RS_FINOR_MASK_L1MenuCollisions2022_v1_1_0.xml'),
VetoMaskXMLFile = cms.string('UGT_BASE_RS_VETO_MASK_L1MenuCollisions2022_v1_1_0.xml'),
)


10 changes: 2 additions & 8 deletions L1Trigger/L1TGlobal/test/runGlobalFakeInputProducer.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,7 @@

# Other statements
from Configuration.AlCa.GlobalTag import GlobalTag
## process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS1', '')
#process.GlobalTag = GlobalTag(process.GlobalTag, '106X_upgrade2018_realistic_v11', '')
process.GlobalTag = GlobalTag(process.GlobalTag, '112X_mcRun2_asymptotic_v2', '')
## process.GlobalTag = GlobalTag(process.GlobalTag, '90X_upgrade2017_realistic_PerfectEcalIc_EGM_PFCalib', '')
## auto:upgradePLS1
## 81X_upgrade2017_realistic_v26
## 80X_mcRun2_asymptotic_v14
process.GlobalTag = GlobalTag(process.GlobalTag, '123X_mcRun3_2021_realistic_v13', '')

## ## needed until prescales go into GlobalTag ########################
## from CondCore.DBCommon.CondDBSetup_cfi import CondDBSetup
Expand Down Expand Up @@ -210,7 +204,7 @@

process.load("L1Trigger.L1TGlobal.TriggerMenu_cff")

xmlMenu="L1Menu_Collisions2022_v1_0_0.xml"
xmlMenu="L1Menu_Collisions2022_v1_1_0.xml"
process.TriggerMenu.L1TriggerMenuFile = cms.string(xmlMenu)
process.ESPreferL1TXML = cms.ESPrefer("L1TUtmTriggerMenuESProducer","TriggerMenu")

Expand Down