diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py index 47cb25c16b145..3b860f957eb0f 100644 --- a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py @@ -137,6 +137,8 @@ DQMHarvestLumi = cms.Sequence() +DQMHarvestCTPPS = cms.Sequence() + DQMHarvestMuon = cms.Sequence( dtClients * rpcTier0Client * cscOfflineCollisionsClients * diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py index 0d74e0157c484..f960b8511185d 100644 --- a/DQMOffline/Configuration/python/DQMOffline_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_cff.py @@ -32,6 +32,7 @@ cscSources * es_dqm_source_offline * castorSources * + ctppsDQM * HcalDQMOfflineSequence ) DQMOfflineDPG = cms.Sequence( DQMOfflinePreDPG * @@ -83,14 +84,7 @@ # dqmFastTimerServiceLuminosity * DQMMessageLogger ) -_ctpps_2016_DQMOffline = DQMOffline.copy() -_ctpps_2016_DQMOffline *= ctppsDQM -from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 -ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline) - -_ctpps_2016_DQMOffline = DQMOffline.copy() -#_ctpps_2016_DQMOffline *= ctppsDQM -ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline) +DQMOfflineCTPPS = cms.Sequence( ctppsDQM ) DQMOfflineExtraHLT = cms.Sequence( offlineValidationHLTSource diff --git a/DQMOffline/Configuration/python/autoDQM.py b/DQMOffline/Configuration/python/autoDQM.py index 25e22f8803cc4..b67b0764b8be0 100644 --- a/DQMOffline/Configuration/python/autoDQM.py +++ b/DQMOffline/Configuration/python/autoDQM.py @@ -54,6 +54,10 @@ 'PostDQMOffline', 'DQMHarvestEGamma'], + 'ctpps': ['DQMOfflineCTPPS', + 'PostDQMOffline', + 'DQMHarvestCTPPS'], + 'btag': ['DQMOfflineBTag', 'PostDQMOffline', 'DQMHarvestBTag'], @@ -84,17 +88,17 @@ 'PostDQMOffline', '@common+@muon+@hcal+@jetmet+@ecal+@egamma'], - 'rerecoCommon': ['@common+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma', + 'rerecoCommon': ['@common+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps', 'PostDQMOffline', - '@common+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma'], + '@common+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps'], - 'rerecoSingleMuon': ['@common+@muon+@hcal+@jetmet+@ecal+@egamma+@lumi+@L1TMuon+@L1TEgamma', + 'rerecoSingleMuon': ['@common+@muon+@hcal+@jetmet+@ecal+@egamma+@lumi+@L1TMuon+@L1TEgamma+@ctpps', 'PostDQMOffline', - '@common+@muon+@hcal+@jetmet+@ecal+@egamma+@lumi+@L1TMuon+@L1TEgamma'], + '@common+@muon+@hcal+@jetmet+@ecal+@egamma+@lumi+@L1TMuon+@L1TEgamma+@ctpps'], - 'rerecoZeroBias' : ['@commonSiStripZeroBias+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma', + 'rerecoZeroBias' : ['@commonSiStripZeroBias+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps', 'PostDQMOffline', - '@commonSiStripZeroBias+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma'], + '@commonSiStripZeroBias+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma+@ctpps'], 'rerecoZeroBiasFakeHLT' : ['@commonSiStripZeroBiasFakeHLT+@muon+@hcal+@jetmet+@ecal+@egamma+@L1TMuon+@L1TEgamma', 'PostDQMOffline',