Merge pull request #21232 from davidlange6/hltdqm94xv1

backport hlt dqm rearrangements
cms-sw · Nov 9, 2017 · 1fed070 · 1fed070
2 parents f7d493c + c292158
commit 1fed070
Show file tree

Hide file tree

Showing 21 changed files with 249 additions and 169 deletions.
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py
@@ -12,6 +12,7 @@
 
 
 dqmHarvesting = cms.Path(DQMOffline_SecondStep*DQMOffline_Certification)
+dqmHarvestingExtraHLT = cms.Path(DQMOffline_SecondStep_ExtraHLT*DQMOffline_Certification)
 dqmHarvestingFakeHLT = cms.Path(DQMOffline_SecondStep_FakeHLT*DQMOffline_Certification)
 #dqmHarvesting = cms.Sequence(DQMOffline_SecondStep*DQMOffline_Certification)
 #dqmHarvestingFakeHLT = cms.Sequence(DQMOffline_SecondStep_FakeHLT*DQMOffline_Certification)

diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -70,6 +70,11 @@
                                       HLTMonitoringClient *
                                       DQMMessageLoggerClientSeq *
                                       dqmFastTimerServiceClient)
+
+DQMOffline_SecondStep_ExtraHLT = cms.Sequence( 
+    hltOfflineDQMClientExtra
+)
+
 DQMOffline_SecondStep_FakeHLT = cms.Sequence( DQMOffline_SecondStep )
 DQMOffline_SecondStep_FakeHLT.remove( HLTMonitoringClient )
 

diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -87,6 +87,11 @@
 #_ctpps_2016_DQMOffline *= ctppsDQM
 ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline)
 
+DQMOfflineExtraHLT = cms.Sequence( 
+    offlineValidationHLTSource
+)
+
+
 DQMOfflineFakeHLT = cms.Sequence( DQMOffline )
 DQMOfflineFakeHLT.remove( HLTMonitoring )
 

diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py
@@ -50,6 +50,9 @@
             'standardDQM': ['DQMOffline',
                             'PostDQMOffline',
                             'dqmHarvesting'],
+            'ExtraHLT': ['DQMOfflineExtraHLT',
+                         'PostDQMOffline',
+                         'dqmHarvestingExtraHLT'],
             'standardDQMFakeHLT': ['DQMOfflineFakeHLT',
                                    'PostDQMOffline',
                                    'dqmHarvestingFakeHLT'],

diff --git a/DQMOffline/Trigger/python/B2GMonitoring_cff.py b/DQMOffline/Trigger/python/B2GMonitoring_cff.py
@@ -140,6 +140,9 @@
 AK8PFJet420_TrimMass30_PromptMonitoring.numGenericTriggerEventPSet.hltPaths = cms.vstring("HLT_AK8PFJet420_TrimMass30_v*")
 
 b2gMonitorHLT = cms.Sequence(
+)
+
+b2gHLTDQMSourceExtra = cms.Sequence(
     PFHT1050_Mjjmonitoring +
     PFHT1050_Softdropmonitoring +
 
@@ -171,6 +174,3 @@
     B2GegmGsfElectronIDsForDQM*
     B2GegHLTDQMOfflineTnPSource
 )
-
-b2gHLTDQMSourceExtra = cms.Sequence(
-)
diff --git a/DQMOffline/Trigger/python/BTVHLTOfflineSource_cff.py b/DQMOffline/Trigger/python/BTVHLTOfflineSource_cff.py
@@ -1,6 +1,57 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMOffline.Trigger.BTVHLTOfflineSource_cfi import *
+from DQMOffline.Trigger.BTaggingMonitoring_cff import *
 
 btvHLTDQMSourceExtra = cms.Sequence(
+    BTagMu_AK4DiJet20_Mu5
+    + BTagMu_AK4DiJet40_Mu5
+    + BTagMu_AK4DiJet70_Mu5
+    + BTagMu_AK4DiJet110_Mu5    
+    + BTagMu_AK4DiJet170_Mu5
+    + BTagMu_AK4Jet300_Mu5
+    + BTagMu_AK8DiJet170_Mu5
+    + BTagMu_AK8Jet300_Mu5
+    + PFJet40
+    + PFJet60
+    + PFJet80
+    + PFJet140
+    + PFJet200
+    + PFJet260
+    + PFJet320
+    + PFJet400
+    + PFJet450
+    + PFJet500
+    + PFJet550
+    + AK8PFJet40
+    + AK8PFJet60
+    + AK8PFJet80
+    + AK8PFJet140
+    + AK8PFJet200
+    + AK8PFJet260
+    + AK8PFJet320
+    + AK8PFJet400
+    + AK8PFJet450
+    + AK8PFJet500
+    + AK8PFJet550
+    + PFJetFwd40
+    + PFJetFwd60
+    + PFJetFwd80
+    + PFJetFwd140
+    + PFJetFwd200
+    + PFJetFwd260
+    + PFJetFwd320
+    + PFJetFwd400
+    + PFJetFwd450
+    + PFJetFwd500
+    + AK8PFJetFwd40
+    + AK8PFJetFwd60
+    + AK8PFJetFwd80
+    + AK8PFJetFwd140
+    + AK8PFJetFwd200
+    + AK8PFJetFwd260
+    + AK8PFJetFwd320
+    + AK8PFJetFwd400
+    + AK8PFJetFwd450
+    + AK8PFJetFwd500
 )
diff --git a/DQMOffline/Trigger/python/BTaggingMonitoring_cff.py b/DQMOffline/Trigger/python/BTaggingMonitoring_cff.py
@@ -559,54 +559,4 @@
 
 
 btagMonitorHLT = cms.Sequence(
-    BTagMu_AK4DiJet20_Mu5
-    + BTagMu_AK4DiJet40_Mu5
-    + BTagMu_AK4DiJet70_Mu5
-    + BTagMu_AK4DiJet110_Mu5    
-    + BTagMu_AK4DiJet170_Mu5
-    + BTagMu_AK4Jet300_Mu5
-    + BTagMu_AK8DiJet170_Mu5
-    + BTagMu_AK8Jet300_Mu5
-    + PFJet40
-    + PFJet60
-    + PFJet80
-    + PFJet140
-    + PFJet200
-    + PFJet260
-    + PFJet320
-    + PFJet400
-    + PFJet450
-    + PFJet500
-    + PFJet550
-    + AK8PFJet40
-    + AK8PFJet60
-    + AK8PFJet80
-    + AK8PFJet140
-    + AK8PFJet200
-    + AK8PFJet260
-    + AK8PFJet320
-    + AK8PFJet400
-    + AK8PFJet450
-    + AK8PFJet500
-    + AK8PFJet550
-    + PFJetFwd40
-    + PFJetFwd60
-    + PFJetFwd80
-    + PFJetFwd140
-    + PFJetFwd200
-    + PFJetFwd260
-    + PFJetFwd320
-    + PFJetFwd400
-    + PFJetFwd450
-    + PFJetFwd500
-    + AK8PFJetFwd40
-    + AK8PFJetFwd60
-    + AK8PFJetFwd80
-    + AK8PFJetFwd140
-    + AK8PFJetFwd200
-    + AK8PFJetFwd260
-    + AK8PFJetFwd320
-    + AK8PFJetFwd400
-    + AK8PFJetFwd450
-    + AK8PFJetFwd500
 )
diff --git a/DQMOffline/Trigger/python/DQMOffline_HLT_Client_cff.py b/DQMOffline/Trigger/python/DQMOffline_HLT_Client_cff.py
@@ -52,3 +52,5 @@
     JetMetPromClient
     )
 
+hltOfflineDQMClientExtra = cms.Sequence(
+)
diff --git a/DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py b/DQMOffline/Trigger/python/DQMOffline_Trigger_cff.py
@@ -9,7 +9,7 @@
 from DQMOffline.Trigger.HLTGeneralOffline_cfi import *
 # Egamma
 from DQMOffline.Trigger.EgHLTOfflineSource_cfi import *
-from DQMOffline.Trigger.EgammaMonitoring_cff import *
+from DQMOffline.Trigger.EgammaMonitoring_cff import * # tag-n-probe (egammaMonitorHLT + egmHLTDQMSourceExtra)
 # Muon
 from DQMOffline.Trigger.MuonOffline_Trigger_cff import *
 # Top
@@ -49,14 +49,14 @@
 # photon jet
 from DQMOffline.Trigger.HigPhotonJetHLTOfflineSource_cfi import * 
 
-#hotline 
-from DQMOffline.Trigger.hotlineDQM_cfi import *
+##hotline 
+#from DQMOffline.Trigger.hotlineDQM_cfi import * # ORPHAN
 
-#eventshape
-from DQMOffline.Trigger.eventshapeDQM_cfi import *
+##eventshape
+#from DQMOffline.Trigger.eventshapeDQM_cfi import * # OBSOLETE
 
-#UCC
-from DQMOffline.Trigger.heavyionUCCDQM_cfi import *
+##UCC
+#from DQMOffline.Trigger.heavyionUCCDQM_cfi import * # OBSOLETE
 
 import DQMServices.Components.DQMEnvironment_cfi
 dqmEnvHLT= DQMServices.Components.DQMEnvironment_cfi.dqmEnv.clone()
@@ -92,18 +92,14 @@
 offlineHLTSourceOnAOD = cms.Sequence(
     hltResults *
     lumiMonitorHLTsequence *
-    egHLTOffDQMSource * ## NEEDED in VALIDATION, not really in MONITORING
-    egHLTOffDQMSource_HEP17 * ## NEEDED in VALIDATION, not really in MONITORING
     muonFullOfflineDQM *
     HLTTauDQMOffline *
-    fsqHLTOfflineSourceSequence *
-    HILowLumiHLTOfflineSourceSequence *
     hltInclusiveVBFSource *
-    higPhotonJetHLTOfflineSource*
+    higPhotonJetHLTOfflineSource* # plots are filled, but I'm not sure who is really looking at them and what you can get from them ... good candidates to be moved in offlineHLTSourceOnAODextra
     dqmEnvHLT *
-    topHLTriggerOfflineDQM *
-    eventshapeDQMSequence *
-    HeavyIonUCCDQMSequence *
+    topHLTriggerOfflineDQM * # plots are filled, but I'm not sure who is really looking at them and what you can get from them ... good candidates to be moved in offlineHLTSourceOnAODextra
+#    eventshapeDQMSequence * ## OBSOLETE !!!! (looks for HLT_HIQ2Top005_Centrality1030_v, HLT_HIQ2Bottom005_Centrality1030_v, etc)
+#    HeavyIonUCCDQMSequence * ## OBSOLETE !!!! (looks for HLT_HIUCC100_v and HLT_HIUCC020_v)
 #    hotlineDQMSequence * ## ORPHAN !!!!
     egammaMonitorHLT * 
     exoticaMonitorHLT *
@@ -114,25 +110,42 @@
     topMonitorHLT *
     btagMonitorHLT *
     bphMonitorHLT *
-    hltObjectsMonitor *
+    hltObjectsMonitor * # as online DQM, requested/suggested by TSG coordinators
     jetmetMonitorHLT
 )
 
+offlineHLTSourceWithRECO = cms.Sequence(
+    jetMETHLTOfflineAnalyzer
+)
+
 # offline DQM for running in the standard RECO,DQM (in PromptReco, ReReco, relval, etc)
 ## THIS IS THE SEQUENCE TO BE RUN AT TIER0
 ## ADD here only sequences/modules which rely on transient collections produced by the RECO step
 ## and not stored in the AOD format
 offlineHLTSource = cms.Sequence(
+    offlineHLTSourceWithRECO *
     offlineHLTSourceOnAOD
-    + hcalMonitoringSequence
-    + jetMETHLTOfflineAnalyzer
+)
+
+## sequence for HI, FSQ and LowLumi
+offlineHLTSourceOnAOD4LowLumi = cms.Sequence(
+    offlineHLTSourceOnAOD *
+    fsqHLTOfflineSourceSequence * 
+    HILowLumiHLTOfflineSourceSequence
+)
+
+offlineHLTSource4LowLumi = cms.Sequence(
+    offlineHLTSourceWithRECO *
+    offlineHLTSourceOnAOD4LowLumi
 )
 
 # offline DQM to be run on AOD (w/o the need of the RECO step on-the-fly) only in the VALIDATION of the HLT menu based on data
 # it is needed in order to have the DQM code in the release, w/o the issue of crashing the tier0
 # asa the new modules in the sequence offlineHLTSourceOnAODextra are tested,
 # these have to be migrated in the main offlineHLTSourceOnAOD sequence
 offlineHLTSourceOnAODextra = cms.Sequence(
+    egHLTOffDQMSource * ## NEEDED in VALIDATION, not really in MONITORING
+    egHLTOffDQMSource_HEP17 * ## NEEDED in VALIDATION, not really in MONITORING
 ### POG
     btvHLTDQMSourceExtra
     * egmHLTDQMSourceExtra
@@ -156,7 +169,7 @@
 # it is needed in order to have the DQM code in the release, w/o the issue of crashing the tier0
 # asa the new modules in the sequence offlineHLTSourceOnAODextra are tested
 # these have to be migrated in the main offlineHLTSourceOnAOD sequence
-offlineValidationHLTSource = cms.Sequence(
+offlineValidationHLTSourceOnAOD = cms.Sequence(
     offlineHLTSourceOnAOD 
     + offlineHLTSourceOnAODextra
 )
@@ -168,6 +181,7 @@
     subSystemFolder = cms.untracked.string('HLT')
     )
 
+# sequences run @tier0 on HLTMonitor PD
 OfflineHLTMonitoring = cms.Sequence(
     dqmInfoHLTMon *
     lumiMonitorHLTsequence * # lumi
@@ -179,11 +193,26 @@
     egmTrackingMonitorHLT * # egm tracking
     vertexingMonitorHLT # vertexing
     )
+
+# sequences run @tier0 on HLTMonitor PD w/ HI (PbPb, XeXe), pPb, ppRef
 OfflineHLTMonitoringPA = cms.Sequence(
     dqmInfoHLTMon *
     trackingMonitorHLT *
     PAtrackingMonitorHLT  
     )
 
-triggerOfflineDQMSource =  cms.Sequence(offlineHLTSource)
+### sequence run @tier0 (called by main DQM sequences in DQMOffline/Configuration/python/DQMOffline_cff.py) on all PDs, but HLTMonitor one
+triggerOfflineDQMSource =  cms.Sequence(
+    offlineHLTSource
+)
+
+triggerOfflineDQMSource4LowLumi =  cms.Sequence(
+    offlineHLTSource4LowLumi
+)
 
+# this sequence can be used by AlCa for the validation of conditions,
+# because it is like offlineHLTSource (run @tier0) + offlineHLTSourceOnAODextra (meant to validate new features)
+offlineValidationHLTSource = cms.Sequence(
+    offlineHLTSource
+    + offlineHLTSourceOnAODextra
+)
diff --git a/DQMOffline/Trigger/python/ExoticaMonitoring_cff.py b/DQMOffline/Trigger/python/ExoticaMonitoring_cff.py
@@ -11,13 +11,13 @@
 exoticaMonitorHLT = cms.Sequence(
     exoHLTMETmonitoring
   + exoHLTNoBPTXmonitoring
-  + exoHLTPhotonmonitoring
-  + exoHLTHTmonitoring
-  + exoHLTMETplusTrackMonitoring
-  + exoHLTMuonmonitoring
-  + exoHLTDisplacedJetmonitoring
 )
 
 
 exoHLTDQMSourceExtra = cms.Sequence(
+  exoHLTPhotonmonitoring
+  + exoHLTHTmonitoring
+# + exoHLTMETplusTrackMonitoring    # disabled pending the review of METplusTrackMonitor.cc
+  + exoHLTMuonmonitoring
+  + exoHLTDisplacedJetmonitoring
 )
diff --git a/DQMOffline/Trigger/python/HiggsMonitoring_cff.py b/DQMOffline/Trigger/python/HiggsMonitoring_cff.py
@@ -446,6 +446,10 @@
 
 ###############################Higgs Monitor HLT##############################################
 higgsMonitorHLT = cms.Sequence(
+)
+
+
+higHLTDQMSourceExtra = cms.Sequence(
     higgsinvHLTJetMETmonitoring
   + higgsHLTDiphotonMonitoring
   + higgstautauHLTVBFmonitoring
@@ -487,7 +491,3 @@
   + mssmHbbBtagTriggerMonitor 
   + mssmHbbMonitorHLT 
 )
-
-
-higHLTDQMSourceExtra = cms.Sequence(
-)
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,3 +52,5 @@ @@
         JetMetPromClient
         )
+    hltOfflineDQMClientExtra = cms.Sequence(
+    )