Skip to content

Commit

Permalink
Merge pull request #5 from mmusich/l1Stage1DQMmodule
Browse files Browse the repository at this point in the history
add rest of parameters for GenericTriggerEventFlag in configuration / fillDescriptions
  • Loading branch information
tvami authored Feb 23, 2022
2 parents e41e6ea + 059869d commit df23d7c
Showing 9 changed files with 63 additions and 17 deletions.
27 changes: 18 additions & 9 deletions DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
Original file line number Diff line number Diff line change
@@ -70,15 +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)
),
PixelDCSfilter = dict(stage2 = cms.bool(True)),
StripDCSfilter = dict(stage2 = 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 *
4 changes: 4 additions & 0 deletions DQMOffline/Trigger/plugins/BPHMonitor.cc
Original file line number Diff line number Diff line change
@@ -1262,6 +1262,10 @@ void BPHMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
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);

3 changes: 3 additions & 0 deletions DQMOffline/Trigger/plugins/JetMonitor.cc
Original file line number Diff line number Diff line change
@@ -669,6 +669,9 @@ void JetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
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);
3 changes: 3 additions & 0 deletions DQMOffline/Trigger/plugins/METMonitor.cc
Original file line number Diff line number Diff line change
@@ -392,6 +392,9 @@ void METMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
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);
3 changes: 3 additions & 0 deletions DQMOffline/Trigger/plugins/MuonMonitor.cc
Original file line number Diff line number Diff line change
@@ -371,6 +371,9 @@ void MuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
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", {});

10 changes: 8 additions & 2 deletions DQMOffline/Trigger/python/BPHMonitor_cfi.py
Original file line number Diff line number Diff line change
@@ -118,6 +118,12 @@
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltBPHmonitoring,
stageL1Trigger = 2,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True)))
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)))

10 changes: 8 additions & 2 deletions DQMOffline/Trigger/python/JetMonitor_cfi.py
Original file line number Diff line number Diff line change
@@ -41,6 +41,12 @@

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltJetMETmonitoring,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True)))
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)))

10 changes: 8 additions & 2 deletions DQMOffline/Trigger/python/METMonitor_cfi.py
Original file line number Diff line number Diff line change
@@ -40,6 +40,12 @@

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltMETmonitoring,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True)))
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)))

10 changes: 8 additions & 2 deletions DQMOffline/Trigger/python/MuonMonitor_cfi.py
Original file line number Diff line number Diff line change
@@ -41,6 +41,12 @@

from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
stage2L1Trigger.toModify(hltMuonmonitoring,
numGenericTriggerEventPSet = dict(stage2 = cms.bool(True)),
denGenericTriggerEventPSet = dict(stage2 = cms.bool(True)))
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)))

0 comments on commit df23d7c

Please sign in to comment.