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 error in stage1 emulator module names, add missing L1Extra collections (73x) #6649

Merged
merged 2 commits into from Dec 3, 2014
Merged

Fix error in stage1 emulator module names, add missing L1Extra collections (73x) #6649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae9eb73
Fix error in module names; add missing L1Extra collections
apana Nov 27, 2014
cf50456
Merge branch 'CMSSW_7_3_X' of https://github.com/apana/cmssw into myd…
apana Nov 27, 2014
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
25 changes: 14 additions & 11 deletions HLTrigger/Configuration/python/customizeHLTforL1Emulator.py
View file
Open in desktop
Expand Up @@ -148,16 +148,19 @@ def switchToCustomL1Digis(process, customGmt, customGct, customGt):
process.hltL1GtObjectMap.GmtInputTag = cms.InputTag( customGmt )
process.hltL1GtObjectMap.GctInputTag = cms.InputTag( customGct )
if 'hltL1extraParticles' in process.__dict__:
process.hltL1extraParticles.muonSource = cms.InputTag( customGmt )
process.hltL1extraParticles.isolatedEmSource = cms.InputTag( customGct, 'isoEm' )
process.hltL1extraParticles.nonIsolatedEmSource = cms.InputTag( customGct, 'nonIsoEm' )
process.hltL1extraParticles.centralJetSource = cms.InputTag( customGct, 'cenJets' )
process.hltL1extraParticles.forwardJetSource = cms.InputTag( customGct, 'forJets' )
process.hltL1extraParticles.tauJetSource = cms.InputTag( customGct, 'tauJets' )
process.hltL1extraParticles.isoTauJetSource = cms.InputTag( customGct, 'isoTauJets' )
process.hltL1extraParticles.etTotalSource = cms.InputTag( customGct )
process.hltL1extraParticles.etHadSource = cms.InputTag( customGct )
process.hltL1extraParticles.etMissSource = cms.InputTag( customGct )
process.hltL1extraParticles.muonSource = cms.InputTag( customGmt )
process.hltL1extraParticles.isolatedEmSource = cms.InputTag( customGct, 'isoEm' )
process.hltL1extraParticles.nonIsolatedEmSource = cms.InputTag( customGct, 'nonIsoEm' )
process.hltL1extraParticles.centralJetSource = cms.InputTag( customGct, 'cenJets' )
process.hltL1extraParticles.forwardJetSource = cms.InputTag( customGct, 'forJets' )
process.hltL1extraParticles.tauJetSource = cms.InputTag( customGct, 'tauJets' )
process.hltL1extraParticles.isoTauJetSource = cms.InputTag( customGct, 'isoTauJets' )
process.hltL1extraParticles.etTotalSource = cms.InputTag( customGct )
process.hltL1extraParticles.etHadSource = cms.InputTag( customGct )
process.hltL1extraParticles.etMissSource = cms.InputTag( customGct )
process.hltL1extraParticles.htMissSource = cms.InputTag( customGct )
process.hltL1extraParticles.hfRingEtSumsSource = cms.InputTag( customGct )
process.hltL1extraParticles.hfRingBitCountsSource = cms.InputTag( customGct )
if 'hltL2MuonSeeds' in process.__dict__:
process.hltL2MuonSeeds.GMTReadoutCollection = cms.InputTag( customGmt )

Expand Down Expand Up @@ -201,7 +204,7 @@ def switchToSimGmtGctGtDigis(process):

def switchToSimStage1Digis(process):
"""patch the process to use newly emulated GMT, GCT and GT results"""
return switchToCustomL1Digis(process, 'gmtReEmulDigis', 'caloStage1LegacyFormatDigis', 'simGtDigis')
return switchToCustomL1Digis(process, 'gmtReEmulDigis', 'simCaloStage1LegacyFormatDigis', 'simGtDigis')

def switchToSimGctGtDigis(process):
"""patch the process to use gtDigis for GMT results, and newly emulated GCT and GT results"""
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TCalorimeter/python/L1TCaloStage1_customForHLT.py
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@ def customiseL1EmulatorFromRaw(process):
# GT
from L1Trigger.Configuration.SimL1Emulator_cff import simGtDigis
simGtDigis.GmtInputTag = 'gmtReEmulDigis'
simGtDigis.GctInputTag = 'caloStage1LegacyFormatDigis'
simGtDigis.GctInputTag = 'simCaloStage1LegacyFormatDigis'
simGtDigis.TechnicalTriggersInputTags = cms.VInputTag( )

# run Calo TPGs, L1 GCT, technical triggers, L1 GT
Expand Down