Synchronise with CMSSW_11_1_0_pre4

cms-patatrack · Nov 27, 2020 · 4b39fe2 · 4b39fe2
1 parent 9d7b7c1
commit 4b39fe2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -1,7 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMServices.Components.DQMMessageLoggerClient_cff import *
-from DQMServices.Components.DQMDcsInfoClient_cfi import *
 from DQMServices.Components.DQMFastTimerServiceClient_cfi import *
 
 from DQMOffline.Ecal.ecal_dqm_client_offline_cff import *
@@ -17,8 +16,6 @@
 from DQMOffline.L1Trigger.L1TriggerDqmOffline_cff import *
 from DQM.SiTrackerPhase2.Phase2TrackerDQMHarvesting_cff import *
 
-DQMOffline_SecondStepDCS = cms.Sequence( dqmDcsInfoClient )
-
 DQMOffline_SecondStepEcal = cms.Sequence( ecal_dqm_client_offline *
 					  es_dqm_client_offline )
 
@@ -38,7 +35,7 @@
 
 DQMOffline_SecondStepL1T = cms.Sequence( l1TriggerDqmOfflineClient )
 
-DQMOffline_SecondStep_PreDPG = cms.Sequence( DQMOffline_SecondStepDCS *
+DQMOffline_SecondStep_PreDPG = cms.Sequence( 
                                              DQMOffline_SecondStepEcal *
                                              DQMOffline_SecondStepTrackerStrip *
 					     DQMOffline_SecondStepTrackerPixel *
@@ -119,8 +116,6 @@
 from DQM.TrackingMonitorClient.pixelTrackingEffFromHitPattern_cff import *
 from DQM.TrackingMonitorClient.pixelVertexResolutionClient_cfi import *
 
-DQMHarvestDCS = cms.Sequence ( dqmDcsInfoClient )
-
 DQMHarvestTrackerStrip = cms.Sequence ( SiStripOfflineDQMClient )
 
 DQMHarvestTrackerPixel = cms.Sequence ( PixelOfflineDQMClientNoDataCertification )
@@ -143,7 +138,6 @@
 DQMHarvestL1TMuon = cms.Sequence( l1TriggerMuonDqmOfflineClient )
 
 DQMHarvestCommon = cms.Sequence( DQMMessageLoggerClientSeq *
-                                 DQMHarvestDCS *
                                  DQMHarvestTrackerStrip *
                                  DQMHarvestTrack *
                                  DQMHarvestTrackerPixel *
@@ -159,7 +153,6 @@
 
 DQMHarvestCommonSiStripZeroBias = cms.Sequence(
                                                DQMMessageLoggerClientSeq *
-                                               DQMHarvestDCS *
                                                DQMHarvestTrackerStrip *
                                                DQMHarvestTrack *
                                                DQMHarvestTrackerPixel *
@@ -180,7 +173,6 @@
                                         pixelVertexResolutionClient )
 
 DQMHarvestOuterTracker = cms.Sequence(
-                                 dqmDcsInfoClient *
                                  OuterTrackerClient *
                                  dqmFEDIntegrityClient *
                                  DQMMessageLoggerClientSeq *

diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMServices.Components.DQMMessageLogger_cfi import *
-from DQMServices.Components.DQMDcsInfo_cfi import *
+from DQMServices.Components.DQMProvInfo_cfi import *
 from DQMServices.Components.DQMFastTimerService_cff import *
 
 from DQMOffline.L1Trigger.L1TriggerDqmOffline_cff import *
@@ -22,7 +22,8 @@
 
 DQMMessageLoggerSeq = cms.Sequence( DQMMessageLogger )
 
-DQMOfflineDCS = cms.Sequence( dqmDcsInfo )
+dqmProvInfo.runType = "pp_run"
+DQMOfflineDCS = cms.Sequence( dqmProvInfo )
 
 # L1 trigger sequences
 DQMOfflineL1T = cms.Sequence( l1TriggerDqmOffline ) # L1 emulator is run within this sequence for real data