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

Drop type specs for L1Trigger, Muon and RecoB #36667

Closed
wants to merge 5 commits into from
Closed

Drop type specs for L1Trigger, Muon and RecoB #36667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cb7bea
Drop type specs for L1Trigger, Muon and RecoB
NiharSaha Jan 10, 2022
a404123
Delete gemEfficiencyAnalyzerCosmics_cfi.py
NiharSaha Jan 11, 2022
d3eb344
Delete gemEfficiencyAnalyzer_cfi.py
NiharSaha Jan 11, 2022
e1482c1
Delete gemEfficiencyHarvesterCosmics_cfi.py
NiharSaha Jan 11, 2022
cc38ba6
Delete gemEfficiencyHarvester_cfi.py
NiharSaha Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions DQMOffline/L1Trigger/python/L1TEGammaEfficiency_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@
)

l1tEGammaEmuEfficiency = l1tEGammaEfficiency.clone(
subDirs=cms.untracked.vstring(
'L1TEMU/L1TObjects/L1TEGamma/L1TriggerVsReco'),
subDirs = ('L1TEMU/L1TObjects/L1TEGamma/L1TriggerVsReco',)
)

from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017
Expand Down
4 changes: 2 additions & 2 deletions DQMOffline/L1Trigger/python/L1TEGammaOffline_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

# emulator module
l1tEGammaOfflineDQMEmu = l1tEGammaOfflineDQM.clone(
stage2CaloLayer2EGammaSource=cms.InputTag("simCaloStage2Digis"),
stage2CaloLayer2EGammaSource= "simCaloStage2Digis",

histFolder=cms.string('L1TEMU/L1TObjects/L1TEGamma/L1TriggerVsReco'),
histFolder = 'L1TEMU/L1TObjects/L1TEGamma/L1TriggerVsReco'
)
30 changes: 15 additions & 15 deletions DQMOffline/L1Trigger/python/L1TEmulatorMonitorOffline_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@

from DQM.L1TMonitor.L1TStage2Emulator_cff import *
# add calo layer 2 emulation with inputs from the calo layer 1 emulator since the full unpacked data to emulate layer 2 is only available for validation events
valCaloStage2Layer2DigisOffline = valCaloStage2Layer2Digis.clone()
valCaloStage2Layer2DigisOffline.towerToken = cms.InputTag("valCaloStage2Layer1Digis")

valCaloStage2Layer2DigisOffline = valCaloStage2Layer2Digis.clone(
towerToken = "valCaloStage2Layer1Digis"
)
Stage2L1HardwareValidationForOfflineCalo = cms.Sequence(valCaloStage2Layer2DigisOffline)

# Calo layer 2 emulator DQM modules for offline
from DQM.L1TMonitor.L1TdeStage2CaloLayer2_cfi import *
l1tdeStage2CaloLayer2Offline = l1tdeStage2CaloLayer2.clone()
l1tdeStage2CaloLayer2Offline.calol2JetCollectionEmul = cms.InputTag("valCaloStage2Layer2DigisOffline")
l1tdeStage2CaloLayer2Offline.calol2EGammaCollectionEmul = cms.InputTag("valCaloStage2Layer2DigisOffline")
l1tdeStage2CaloLayer2Offline.calol2TauCollectionEmul = cms.InputTag("valCaloStage2Layer2DigisOffline")
l1tdeStage2CaloLayer2Offline.calol2EtSumCollectionEmul = cms.InputTag("valCaloStage2Layer2DigisOffline")

l1tdeStage2CaloLayer2Offline = l1tdeStage2CaloLayer2.clone(
calol2JetCollectionEmul = "valCaloStage2Layer2DigisOffline",
calol2EGammaCollectionEmul = "valCaloStage2Layer2DigisOffline",
calol2TauCollectionEmul = "valCaloStage2Layer2DigisOffline",
calol2EtSumCollectionEmul = "valCaloStage2Layer2DigisOffline"
)
from DQM.L1TMonitor.L1TStage2CaloLayer2Emul_cfi import *
l1tStage2CaloLayer2EmulOffline = l1tStage2CaloLayer2Emul.clone()
l1tStage2CaloLayer2EmulOffline.stage2CaloLayer2JetSource = cms.InputTag("valCaloStage2Layer2DigisOffline")
l1tStage2CaloLayer2EmulOffline.stage2CaloLayer2EGammaSource = cms.InputTag("valCaloStage2Layer2DigisOffline")
l1tStage2CaloLayer2EmulOffline.stage2CaloLayer2TauSource = cms.InputTag("valCaloStage2Layer2DigisOffline")
l1tStage2CaloLayer2EmulOffline.stage2CaloLayer2EtSumSource = cms.InputTag("valCaloStage2Layer2DigisOffline")

l1tStage2CaloLayer2EmulOffline = l1tStage2CaloLayer2Emul.clone(
stage2CaloLayer2JetSource = "valCaloStage2Layer2DigisOffline",
stage2CaloLayer2EGammaSource = "valCaloStage2Layer2DigisOffline",
stage2CaloLayer2TauSource = "valCaloStage2Layer2DigisOffline",
stage2CaloLayer2EtSumSource = "valCaloStage2Layer2DigisOffline"
)
l1tStage2EmulatorOfflineDQMForCalo = cms.Sequence(
l1tdeStage2CaloLayer2Offline +
l1tStage2CaloLayer2EmulOffline
Expand Down
3 changes: 1 addition & 2 deletions DQMOffline/L1Trigger/python/L1TEtSumEfficiency_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
)

l1tEtSumEmuEfficiency = l1tEtSumEfficiency.clone(
subDirs=cms.untracked.vstring(
'L1TEMU/L1TObjects/L1TEtSum/L1TriggerVsReco'),
subDirs = ('L1TEMU/L1TObjects/L1TEtSum/L1TriggerVsReco',)
)

# modifications for the pp reference run
Expand Down
13 changes: 6 additions & 7 deletions DQMOffline/L1Trigger/python/L1TEtSumJetOffline_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
from L1Trigger.L1TNtuples.L1TPFMetNoMuProducer_cfi import l1tPFMetNoMu

l1tPFMetNoMuForDQM = l1tPFMetNoMu.clone(
pfMETCollection=cms.InputTag('pfMETT1'),
muonCollection=cms.InputTag('muons'),
pfMETCollection = 'pfMETT1',
muonCollection = 'muons'
)

from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
Expand Down Expand Up @@ -168,11 +168,10 @@

# emulator module
l1tEtSumJetOfflineDQMEmu = l1tEtSumJetOfflineDQM.clone(
stage2CaloLayer2JetSource=cms.InputTag("simCaloStage2Digis"),
stage2CaloLayer2EtSumSource=cms.InputTag("simCaloStage2Digis"),

histFolderEtSum=cms.string('L1TEMU/L1TObjects/L1TEtSum/L1TriggerVsReco'),
histFolderJet=cms.string('L1TEMU/L1TObjects/L1TJet/L1TriggerVsReco'),
stage2CaloLayer2JetSource = "simCaloStage2Digis",
stage2CaloLayer2EtSumSource = "simCaloStage2Digis",
histFolderEtSum = 'L1TEMU/L1TObjects/L1TEtSum/L1TriggerVsReco',
histFolderJet = 'L1TEMU/L1TObjects/L1TJet/L1TriggerVsReco'
)

# sequences
Expand Down
3 changes: 1 addition & 2 deletions DQMOffline/L1Trigger/python/L1TJetEfficiency_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
)

l1tJetEmuEfficiency = l1tJetEfficiency.clone(
subDirs=cms.untracked.vstring(
'L1TEMU/L1TObjects/L1TJet/L1TriggerVsReco'),
subDirs = ('L1TEMU/L1TObjects/L1TJet/L1TriggerVsReco',)
)

# modifications for the pp reference run
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/L1Trigger/python/L1TMuonDQMEfficiency_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def generateEfficiencyStrings(ptQualCuts):

# emulator efficiency
l1tMuonDQMEmuEfficiency = l1tMuonDQMEfficiency.clone(
subDirs = cms.untracked.vstring("L1TEMU/L1TObjects/L1TMuon/L1TriggerVsReco/")
subDirs = ("L1TEMU/L1TObjects/L1TMuon/L1TriggerVsReco/",)
)

# modifications for the pp reference run
Expand Down
4 changes: 2 additions & 2 deletions DQMOffline/L1Trigger/python/L1TMuonDQMOffline_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@

# emulator module
l1tMuonDQMOfflineEmu = l1tMuonDQMOffline.clone(
gmtInputTag = cms.untracked.InputTag("simGmtStage2Digis"),
histFolder = cms.untracked.string('L1TEMU/L1TObjects/L1TMuon/L1TriggerVsReco')
gmtInputTag = "simGmtStage2Digis",
histFolder = 'L1TEMU/L1TObjects/L1TMuon/L1TriggerVsReco'
)

# modifications for the pp reference run
Expand Down
27 changes: 14 additions & 13 deletions DQMOffline/L1Trigger/python/L1TSync_Harvest_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
# filter to select HLT events
from HLTrigger.HLTfilters.hltHighLevel_cfi import *

l1tSyncHltFilter = hltHighLevel.clone(TriggerResultsTag ="TriggerResults::HLT")
l1tSyncHltFilter.throw = cms.bool(False)
l1tSyncHltFilter.HLTPaths = ['HLT_ZeroBias_v*',
'HLT_L1ETM30_v*',
'HLT_L1MultiJet_v*',
'HLT_L1SingleEG12_v',
'HLT_L1SingleEG5_v*',
'HLT_L1SingleJet16_v*',
'HLT_L1SingleJet36_v*',
'HLT_L1SingleMu10_v*',
'HLT_L1SingleMu20_v*'
]

l1tSyncHltFilter = hltHighLevel.clone(
TriggerResultsTag ="TriggerResults::HLT",
throw = False,
HLTPaths = ['HLT_ZeroBias_v*',
'HLT_L1ETM30_v*',
'HLT_L1MultiJet_v*',
'HLT_L1SingleEG12_v',
'HLT_L1SingleEG5_v*',
'HLT_L1SingleJet16_v*',
'HLT_L1SingleJet36_v*',
'HLT_L1SingleMu10_v*',
'HLT_L1SingleMu20_v*'
]
)


27 changes: 14 additions & 13 deletions DQMOffline/L1Trigger/python/L1TSync_Offline_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
# filter to select HLT events
from HLTrigger.HLTfilters.hltHighLevel_cfi import *

l1tSyncHltFilter = hltHighLevel.clone(TriggerResultsTag ="TriggerResults::HLT")
l1tSyncHltFilter.throw = cms.bool(False)
l1tSyncHltFilter.HLTPaths = ['HLT_ZeroBias_v*',
'HLT_L1ETM30_v*',
'HLT_L1MultiJet_v*',
'HLT_L1SingleEG12_v',
'HLT_L1SingleEG5_v*',
'HLT_L1SingleJet16_v*',
'HLT_L1SingleJet36_v*',
'HLT_L1SingleMu10_v*',
'HLT_L1SingleMu20_v*'
]

l1tSyncHltFilter = hltHighLevel.clone(
TriggerResultsTag ="TriggerResults::HLT",
throw = False,
HLTPaths = ['HLT_ZeroBias_v*',
'HLT_L1ETM30_v*',
'HLT_L1MultiJet_v*',
'HLT_L1SingleEG12_v',
'HLT_L1SingleEG5_v*',
'HLT_L1SingleJet16_v*',
'HLT_L1SingleJet36_v*',
'HLT_L1SingleMu10_v*',
'HLT_L1SingleMu20_v*'
]
)
# L1 synchronization DQM module
from DQMOffline.L1Trigger.L1TSync_Offline_cfi import *

Expand Down
8 changes: 4 additions & 4 deletions DQMOffline/L1Trigger/python/L1TTauDiff_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
l1tTauEmuDiff = l1tDiffHarvesting.clone(
plotCfgs=cms.untracked.VPSet(
cms.untracked.PSet( # EMU comparison
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be converted to a dict and drop type afterward?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I have tried that, but it was showing error. That's why I left them unchanged. May I know if Pset->dist, then VPSet->??

dir1=cms.untracked.string("L1T/L1TObjects/L1TTau/L1TriggerVsReco"),
dir2=cms.untracked.string("L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco"),
outputDir=cms.untracked.string(
dir1 = cms.untracked.string("L1T/L1TObjects/L1TTau/L1TriggerVsReco"),
dir2 = cms.untracked.string("L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco"),
outputDir= cms.untracked.string(
"L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco/Comparison"),
plots=cms.untracked.vstring(allPlots)
plots= cms.untracked.vstring(allPlots)
),
)
)
3 changes: 1 addition & 2 deletions DQMOffline/L1Trigger/python/L1TTauEfficiency_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
)

l1tTauEmuEfficiency = l1tTauEfficiency.clone(
subDirs=cms.untracked.vstring(
'L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco'),
subDirs= ('L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco',)
)
6 changes: 3 additions & 3 deletions DQMOffline/L1Trigger/python/L1TTauOffline_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
trigProcess = cms.untracked.string("HLT"),
trigProcess_token = cms.untracked.InputTag("TriggerResults","","HLT"),

stage2CaloLayer2TauSource = cms.InputTag("simCaloStage2Digis"),
histFolder=cms.string('L1T/L1TObjects/L1TTau/L1TriggerVsReco'),

tauEfficiencyThresholds=cms.vint32(tauEfficiencyThresholds),
Expand All @@ -50,7 +51,6 @@
)

l1tTauOfflineDQMEmu = l1tTauOfflineDQM.clone(
stage2CaloLayer2TauSource=cms.InputTag("simCaloStage2Digis"),

histFolder=cms.string('L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco'),
stage2CaloLayer2TauSource = "simCaloStage2Digis",
histFolder= 'L1TEMU/L1TObjects/L1TTau/L1TriggerVsReco'
)
18 changes: 9 additions & 9 deletions DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#

import DQMServices.Components.DQMEnvironment_cfi
dqmEnvL1T = DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone()
dqmEnvL1T.subSystemFolder = 'L1T'

dqmEnvL1T = DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone(
subSystemFolder = 'L1T'
)
# DQM online L1 Trigger modules, with offline configuration
from DQMOffline.L1Trigger.L1TMonitorOffline_cff import *
from DQMOffline.L1Trigger.L1TMonitorClientOffline_cff import *
Expand All @@ -29,18 +29,18 @@
# DQM offline L1 Trigger versus Reco modules

import DQMServices.Components.DQMEnvironment_cfi
dqmEnvL1TriggerReco = DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone()
dqmEnvL1TriggerReco.subSystemFolder = 'L1T/L1TriggerVsReco'

dqmEnvL1TriggerReco = DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone(
subSystemFolder = 'L1T/L1TriggerVsReco'
)
#
# DQM L1 Trigger Emulator in offline environment
# Run also the L1HwVal producers (L1 Trigger emulators)
#

import DQMServices.Components.DQMEnvironment_cfi
dqmEnvL1TEMU = DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone()
dqmEnvL1TEMU.subSystemFolder = 'L1TEMU'

dqmEnvL1TEMU = DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone(
subSystemFolder = 'L1TEMU'
)
# DQM Offline Step 1 cfi/cff imports
from DQMOffline.L1Trigger.L1TRate_Offline_cfi import *
from DQMOffline.L1Trigger.L1TSync_Offline_cfi import *
Expand Down
28 changes: 0 additions & 28 deletions DQMOffline/Muon/python/gemEfficiencyAnalyzerCosmics_cfi.py
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions DQMOffline/Muon/python/gemEfficiencyAnalyzer_cfi.py
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions DQMOffline/Muon/python/gemEfficiencyHarvesterCosmics_cfi.py
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions DQMOffline/Muon/python/gemEfficiencyHarvester_cfi.py
View file
Open in desktop

This file was deleted.

Loading