Merge pull request #27619 from CTPPS/ctpps_dqmoffline_cmssw_11_0

including ctpps in DQMOffline standard conf
cms-sw · Jul 29, 2019 · 289de13 · 289de13
2 parents cd05d3c + 88c9209
commit 289de13
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/DQM/CTPPS/python/ctppsDQM_cff.py b/DQM/CTPPS/python/ctppsDQM_cff.py
@@ -15,7 +15,12 @@
 
 from DQM.CTPPS.ctppsCommonDQMSource_cfi import *
 
-ctppsDQM = cms.Sequence(
+ctppsDQM = cms.Sequence()
+ctppsDQMElastic = cms.Sequence()
+_ctppsDQM = ctppsDQM.copy()
+_ctppsDQMElastic = ctppsDQMElastic.copy()
+
+_ctppsDQM = cms.Sequence(
     totemDAQTriggerDQMSource
     + (totemRPDQMSource * totemRPDQMHarvester)
     + ctppsDiamondDQMSource
@@ -24,7 +29,7 @@
     + ctppsCommonDQMSource
 )
 
-ctppsDQMElastic = cms.Sequence(
+_ctppsDQMElastic = cms.Sequence(
     totemDAQTriggerDQMSource
     + (totemRPDQMSource * totemRPDQMHarvester)
     + ctppsDiamondDQMSource
@@ -33,3 +38,7 @@
     + ctppsCommonDQMSource
     + elasticPlotDQMSource
 )
+
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+ctpps_2016.toReplaceWith(ctppsDQM, _ctppsDQM)
+ctpps_2016.toReplaceWith(ctppsDQMElastic, _ctppsDQMElastic)
diff --git 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
@@ -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
@@ -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',