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)))