From 20080e06c26095f85e589b01fbe8d7fde52b48f3 Mon Sep 17 00:00:00 2001 From: Tamas Date: Tue, 22 Feb 2022 17:35:28 +0100 Subject: [PATCH 1/3] Change DQM modules to use stage-2 L1T --- .../python/SiStripSourceConfigTier0_cff.py | 4 +++- DQMOffline/Trigger/python/BPHMonitor_cfi.py | 10 +++++++--- DQMOffline/Trigger/python/JetMonitor_cfi.py | 5 +++++ DQMOffline/Trigger/python/METMonitor_cfi.py | 6 ++++++ DQMOffline/Trigger/python/MuonMonitor_cfi.py | 5 +++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py index 2e7fd85237c19..6cfd463b3344c 100644 --- a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py +++ b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py @@ -75,7 +75,9 @@ l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"), l1tExtBlkInputTag = cms.InputTag("gtStage2Digis"), ReadPrescalesFromFile = cms.bool(True) - ) + ), + PixelDCSfilter = dict(stage2 = cms.bool(True)), + StripDCSfilter = dict(stage2 = cms.bool(True)) ) # refitter ### (FIXME rename, move) diff --git a/DQMOffline/Trigger/python/BPHMonitor_cfi.py b/DQMOffline/Trigger/python/BPHMonitor_cfi.py index 71dab23a1a871..27531794b8547 100644 --- a/DQMOffline/Trigger/python/BPHMonitor_cfi.py +++ b/DQMOffline/Trigger/python/BPHMonitor_cfi.py @@ -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') #) @@ -117,3 +114,10 @@ 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)), + denGenericTriggerEventPSet = dict(stage2 = cms.bool(True))) + diff --git a/DQMOffline/Trigger/python/JetMonitor_cfi.py b/DQMOffline/Trigger/python/JetMonitor_cfi.py index 932838c53443b..fe8eb6b9ed3c5 100644 --- a/DQMOffline/Trigger/python/JetMonitor_cfi.py +++ b/DQMOffline/Trigger/python/JetMonitor_cfi.py @@ -39,3 +39,8 @@ 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)), + denGenericTriggerEventPSet = dict(stage2 = cms.bool(True))) + diff --git a/DQMOffline/Trigger/python/METMonitor_cfi.py b/DQMOffline/Trigger/python/METMonitor_cfi.py index 8f72ba6acc070..668575221efde 100644 --- a/DQMOffline/Trigger/python/METMonitor_cfi.py +++ b/DQMOffline/Trigger/python/METMonitor_cfi.py @@ -37,3 +37,9 @@ 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)), + denGenericTriggerEventPSet = dict(stage2 = cms.bool(True))) + diff --git a/DQMOffline/Trigger/python/MuonMonitor_cfi.py b/DQMOffline/Trigger/python/MuonMonitor_cfi.py index 93c16eb01c427..cfc74964fc969 100644 --- a/DQMOffline/Trigger/python/MuonMonitor_cfi.py +++ b/DQMOffline/Trigger/python/MuonMonitor_cfi.py @@ -39,3 +39,8 @@ 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)), + denGenericTriggerEventPSet = dict(stage2 = cms.bool(True))) + From e41e6ea288b7dc4b2d1d3ecff9f624919fee34b8 Mon Sep 17 00:00:00 2001 From: Tamas Date: Tue, 22 Feb 2022 19:59:52 +0100 Subject: [PATCH 2/3] Add stage2 to fillDescribtion --- DQMOffline/Trigger/plugins/BPHMonitor.cc | 1 + DQMOffline/Trigger/plugins/JetMonitor.cc | 1 + DQMOffline/Trigger/plugins/METMonitor.cc | 1 + DQMOffline/Trigger/plugins/MuonMonitor.cc | 2 ++ 4 files changed, 5 insertions(+) diff --git a/DQMOffline/Trigger/plugins/BPHMonitor.cc b/DQMOffline/Trigger/plugins/BPHMonitor.cc index 56168251006b6..0b9b1038b07c5 100644 --- a/DQMOffline/Trigger/plugins/BPHMonitor.cc +++ b/DQMOffline/Trigger/plugins/BPHMonitor.cc @@ -1261,6 +1261,7 @@ void BPHMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("errorReplyL1", true); genericTriggerEventPSet.add("l1BeforeMask", true); genericTriggerEventPSet.add("verbosityLevel", 0); + genericTriggerEventPSet.add("stage2", false); desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); desc.add("denGenericTriggerEventPSet", genericTriggerEventPSet); diff --git a/DQMOffline/Trigger/plugins/JetMonitor.cc b/DQMOffline/Trigger/plugins/JetMonitor.cc index a68edb4c60779..72728d339d955 100644 --- a/DQMOffline/Trigger/plugins/JetMonitor.cc +++ b/DQMOffline/Trigger/plugins/JetMonitor.cc @@ -668,6 +668,7 @@ void JetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("hltDBKey", ""); genericTriggerEventPSet.add("errorReplyHlt", false); genericTriggerEventPSet.add("verbosityLevel", 1); + genericTriggerEventPSet.add("stage2", false); desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); desc.add("denGenericTriggerEventPSet", genericTriggerEventPSet); diff --git a/DQMOffline/Trigger/plugins/METMonitor.cc b/DQMOffline/Trigger/plugins/METMonitor.cc index 34e9384027f49..5dd4591e90e12 100644 --- a/DQMOffline/Trigger/plugins/METMonitor.cc +++ b/DQMOffline/Trigger/plugins/METMonitor.cc @@ -391,6 +391,7 @@ void METMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("hltDBKey", ""); genericTriggerEventPSet.add("errorReplyHlt", false); genericTriggerEventPSet.add("verbosityLevel", 1); + genericTriggerEventPSet.add("stage2", false); desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); desc.add("denGenericTriggerEventPSet", genericTriggerEventPSet); diff --git a/DQMOffline/Trigger/plugins/MuonMonitor.cc b/DQMOffline/Trigger/plugins/MuonMonitor.cc index 54bcaa4b630a4..7a2e412f6b984 100644 --- a/DQMOffline/Trigger/plugins/MuonMonitor.cc +++ b/DQMOffline/Trigger/plugins/MuonMonitor.cc @@ -370,6 +370,8 @@ void MuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("verbosityLevel", 1); genericTriggerEventPSet.add("andOrL1", false); genericTriggerEventPSet.add("l1BeforeMask", false); + genericTriggerEventPSet.add("stage2", false); + genericTriggerEventPSet.add>("l1Algorithms", {}); desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); From 059869d5d4a26113a792e412a263a9173c3b030e Mon Sep 17 00:00:00 2001 From: mmusich Date: Wed, 23 Feb 2022 11:30:50 +0100 Subject: [PATCH 3/3] add rest of parameters for GenericTriggerEventFlag in configuration / fillDescriptions --- .../python/SiStripSourceConfigTier0_cff.py | 27 ++++++++++++------- DQMOffline/Trigger/plugins/BPHMonitor.cc | 4 +++ DQMOffline/Trigger/plugins/JetMonitor.cc | 3 +++ DQMOffline/Trigger/plugins/METMonitor.cc | 3 +++ DQMOffline/Trigger/plugins/MuonMonitor.cc | 3 +++ DQMOffline/Trigger/python/BPHMonitor_cfi.py | 10 +++++-- DQMOffline/Trigger/python/JetMonitor_cfi.py | 10 +++++-- DQMOffline/Trigger/python/METMonitor_cfi.py | 10 +++++-- DQMOffline/Trigger/python/MuonMonitor_cfi.py | 10 +++++-- 9 files changed, 63 insertions(+), 17 deletions(-) diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py index 6cfd463b3344c..e829e57769394 100644 --- a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py +++ b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py @@ -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 * diff --git a/DQMOffline/Trigger/plugins/BPHMonitor.cc b/DQMOffline/Trigger/plugins/BPHMonitor.cc index 0b9b1038b07c5..a3dd4f859834f 100644 --- a/DQMOffline/Trigger/plugins/BPHMonitor.cc +++ b/DQMOffline/Trigger/plugins/BPHMonitor.cc @@ -1262,6 +1262,10 @@ void BPHMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("l1BeforeMask", true); genericTriggerEventPSet.add("verbosityLevel", 0); genericTriggerEventPSet.add("stage2", false); + genericTriggerEventPSet.add("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("ReadPrescalesFromFile", false); + desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); desc.add("denGenericTriggerEventPSet", genericTriggerEventPSet); diff --git a/DQMOffline/Trigger/plugins/JetMonitor.cc b/DQMOffline/Trigger/plugins/JetMonitor.cc index 72728d339d955..55bb731fd44d3 100644 --- a/DQMOffline/Trigger/plugins/JetMonitor.cc +++ b/DQMOffline/Trigger/plugins/JetMonitor.cc @@ -669,6 +669,9 @@ void JetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("errorReplyHlt", false); genericTriggerEventPSet.add("verbosityLevel", 1); genericTriggerEventPSet.add("stage2", false); + genericTriggerEventPSet.add("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("ReadPrescalesFromFile", false); desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); desc.add("denGenericTriggerEventPSet", genericTriggerEventPSet); diff --git a/DQMOffline/Trigger/plugins/METMonitor.cc b/DQMOffline/Trigger/plugins/METMonitor.cc index 5dd4591e90e12..beb8345ee9b3f 100644 --- a/DQMOffline/Trigger/plugins/METMonitor.cc +++ b/DQMOffline/Trigger/plugins/METMonitor.cc @@ -392,6 +392,9 @@ void METMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("errorReplyHlt", false); genericTriggerEventPSet.add("verbosityLevel", 1); genericTriggerEventPSet.add("stage2", false); + genericTriggerEventPSet.add("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("ReadPrescalesFromFile", false); desc.add("numGenericTriggerEventPSet", genericTriggerEventPSet); desc.add("denGenericTriggerEventPSet", genericTriggerEventPSet); diff --git a/DQMOffline/Trigger/plugins/MuonMonitor.cc b/DQMOffline/Trigger/plugins/MuonMonitor.cc index 7a2e412f6b984..2988f86ebeaf5 100644 --- a/DQMOffline/Trigger/plugins/MuonMonitor.cc +++ b/DQMOffline/Trigger/plugins/MuonMonitor.cc @@ -371,6 +371,9 @@ void MuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) genericTriggerEventPSet.add("andOrL1", false); genericTriggerEventPSet.add("l1BeforeMask", false); genericTriggerEventPSet.add("stage2", false); + genericTriggerEventPSet.add("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis")); + genericTriggerEventPSet.add("ReadPrescalesFromFile", false); genericTriggerEventPSet.add>("l1Algorithms", {}); diff --git a/DQMOffline/Trigger/python/BPHMonitor_cfi.py b/DQMOffline/Trigger/python/BPHMonitor_cfi.py index 27531794b8547..9ac7bb1543a5d 100644 --- a/DQMOffline/Trigger/python/BPHMonitor_cfi.py +++ b/DQMOffline/Trigger/python/BPHMonitor_cfi.py @@ -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))) diff --git a/DQMOffline/Trigger/python/JetMonitor_cfi.py b/DQMOffline/Trigger/python/JetMonitor_cfi.py index fe8eb6b9ed3c5..d521e5e3938d8 100644 --- a/DQMOffline/Trigger/python/JetMonitor_cfi.py +++ b/DQMOffline/Trigger/python/JetMonitor_cfi.py @@ -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))) diff --git a/DQMOffline/Trigger/python/METMonitor_cfi.py b/DQMOffline/Trigger/python/METMonitor_cfi.py index 668575221efde..0604c6378069b 100644 --- a/DQMOffline/Trigger/python/METMonitor_cfi.py +++ b/DQMOffline/Trigger/python/METMonitor_cfi.py @@ -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))) diff --git a/DQMOffline/Trigger/python/MuonMonitor_cfi.py b/DQMOffline/Trigger/python/MuonMonitor_cfi.py index cfc74964fc969..bd2768127dc67 100644 --- a/DQMOffline/Trigger/python/MuonMonitor_cfi.py +++ b/DQMOffline/Trigger/python/MuonMonitor_cfi.py @@ -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)))