Merge pull request #16576 from mtosi/reenableHLTDQMandValidationSeque…

…nce4phase1 re-enable HLT DQM, Validation and Harvesting sequences
cms-sw · Nov 15, 2016 · 5b8e3d3 · 5b8e3d3
2 parents f8d0176 + 6b427f8
commit 5b8e3d3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 19 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py b/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py
@@ -26,6 +26,6 @@
                                dqmOfflineTriggerCert )
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 phase1Pixel.toReplaceWith(crt_dqmoffline, crt_dqmoffline.copyAndExclude([ # FIXME
-    dqmOfflineTriggerCert, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
+#    dqmOfflineTriggerCert, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
     sipixelCertification # segfaults with pixel harvesting plots missing
 ]))
diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -54,10 +54,6 @@
                                              SusyPostProcessorSequence *
                                              runTauEff)
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
-phase1Pixel.toReplaceWith(DQMOffline_SecondStep_PrePOG, DQMOffline_SecondStep_PrePOG.copyAndExclude([
-    hltOfflineDQMClient, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
-    runTauEff,           # Excessive printouts because 2017 doesn't have HLT yet
-]))
 
 DQMOffline_SecondStepPOG = cms.Sequence( dqmRefHistoRootFileGetter *
                                          DQMOffline_SecondStep_PrePOG *
@@ -72,10 +68,6 @@
                                       HLTMonitoringClient *
                                       DQMMessageLoggerClientSeq *
                                       dqmFastTimerServiceClient)
-phase1Pixel.toReplaceWith(DQMOffline_SecondStep, DQMOffline_SecondStep.copyAndExclude([
-    HLTMonitoringClient, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
-]))
-
 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
@@ -62,10 +62,6 @@
                                  produceDenoms *
                                  pfTauRunDQMValidation)
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
-phase1Pixel.toReplaceWith(DQMOfflinePrePOG, DQMOfflinePrePOG.copyAndExclude([ # FIXME
-    triggerOfflineDQMSource, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
-    pfTauRunDQMValidation,   # Excessive printouts because 2017 doesn't have HLT yet
-]))
 
 DQMOfflinePOG = cms.Sequence( DQMOfflinePrePOG *
                               DQMMessageLogger )
@@ -77,9 +73,6 @@
                            HLTMonitoring *
                            dqmFastTimerServiceLuminosity *
                            DQMMessageLogger )
-phase1Pixel.toReplaceWith(DQMOffline, DQMOffline.copyAndExclude([
-    HLTMonitoring # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
-]))
 
 _ctpps_2016_DQMOffline = DQMOffline.copy()
 _ctpps_2016_DQMOffline *= totemDQM

diff --git a/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py b/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py
@@ -37,7 +37,6 @@
     +HltBTagPostVal
     )
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
-phase1Pixel.toReplaceWith(hltpostvalidation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts)
 
 # fastsim customs
 from Configuration.Eras.Modifier_fastSim_cff import fastSim

diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py
@@ -33,7 +33,6 @@
     +ExoticaValidationProdSeq
     )
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
-phase1Pixel.toReplaceWith(hltassociation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the validation
 
 hltvalidation = cms.Sequence(
     HLTMuonVal
@@ -50,7 +49,6 @@
     +SMPValidationSequence
     +hltbtagValidationSequence
     )
-phase1Pixel.toReplaceWith(hltvalidation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the validation
 
 # some hlt collections have no direct fastsim equivalent
 # remove the dependent modules for now