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

Change DQM modules to use stage-2 L1T #37033

Merged
merged 4 commits into from
Feb 24, 2022
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,24 @@

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(SiStripMonitorClusterBPTX,
BPTXfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)
)
)
BPTXfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)
),
PixelDCSfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)),
StripDCSfilter = dict(
stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)
)
)

# refitter ### (FIXME rename, move)
from DQM.SiPixelMonitorTrack.RefitterForPixelDQM import *
Expand Down
5 changes: 5 additions & 0 deletions DQMOffline/Trigger/plugins/BPHMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,11 @@ void BPHMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
genericTriggerEventPSet.add<bool>("errorReplyL1", true);
genericTriggerEventPSet.add<bool>("l1BeforeMask", true);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 0);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down
4 changes: 4 additions & 0 deletions DQMOffline/Trigger/plugins/JetMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,10 @@ void JetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);
Expand Down
4 changes: 4 additions & 0 deletions DQMOffline/Trigger/plugins/METMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,10 @@ void METMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);
Expand Down
5 changes: 5 additions & 0 deletions DQMOffline/Trigger/plugins/MuonMonitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,11 @@ void MuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
genericTriggerEventPSet.add<bool>("andOrL1", false);
genericTriggerEventPSet.add<bool>("l1BeforeMask", false);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);

genericTriggerEventPSet.add<std::vector<std::string>>("l1Algorithms", {});

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
Expand Down
16 changes: 13 additions & 3 deletions DQMOffline/Trigger/python/BPHMonitor_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

hltBPHmonitoring = _bphMonitoring.clone()

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltBPHmonitoring, stageL1Trigger = 2)

#hltBPHmonitoring.options = cms.untracked.PSet(
# SkipEvent = cms.untracked.vstring('ProductNotFound')
#)
Expand Down Expand Up @@ -117,3 +114,16 @@
hltBPHmonitoring.denGenericTriggerEventPSet.andOrDcs = cms.bool( False )
hltBPHmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
hltBPHmonitoring.denGenericTriggerEventPSet.verbosityLevel = cms.uint32(0)

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltBPHmonitoring,
stageL1Trigger = 2,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)))

11 changes: 11 additions & 0 deletions DQMOffline/Trigger/python/JetMonitor_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,14 @@
hltJetMETmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
hltJetMETmonitoring.denGenericTriggerEventPSet.verbosityLevel = cms.uint32(1)

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltJetMETmonitoring,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)))

12 changes: 12 additions & 0 deletions DQMOffline/Trigger/python/METMonitor_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@
hltMETmonitoring.denGenericTriggerEventPSet.verbosityLevel = cms.uint32(1)
#hltMETmonitoring.denGenericTriggerEventPSet.hltPaths = cms.vstring("HLT_IsoMu27_v*");
hltMETmonitoring.denGenericTriggerEventPSet.hltPaths = cms.vstring();

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltMETmonitoring,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)))

11 changes: 11 additions & 0 deletions DQMOffline/Trigger/python/MuonMonitor_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,14 @@
hltMuonmonitoring.denGenericTriggerEventPSet.errorReplyDcs = cms.bool( True )
hltMuonmonitoring.denGenericTriggerEventPSet.verbosityLevel = cms.uint32(1)

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltMuonmonitoring,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True),
l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"),
l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"),
ReadPrescalesFromFile = cms.bool(True)))