Merge pull request #28090 from fioriNTU/CTPPSHarvestingFix

Cleanup of CTPPS sequences
cms-sw · Oct 4, 2019 · 4528839 · 4528839
2 parents 5f71c2c + 7565602
commit 4528839
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/DQM/CTPPS/python/ctppsDQM_cff.py b/DQM/CTPPS/python/ctppsDQM_cff.py
@@ -17,12 +17,15 @@
 
 ctppsDQM = cms.Sequence()
 ctppsDQMElastic = cms.Sequence()
+ctppsDQMHarvest = cms.Sequence()
+
 _ctppsDQM = ctppsDQM.copy()
 _ctppsDQMElastic = ctppsDQMElastic.copy()
+_ctppsDQMHarvest = ctppsDQMHarvest.copy()
 
 _ctppsDQM = cms.Sequence(
     totemDAQTriggerDQMSource
-    + (totemRPDQMSource * totemRPDQMHarvester)
+    + totemRPDQMSource
     + ctppsDiamondDQMSource
     + totemTimingDQMSource
     + ctppsPixelDQMSource
@@ -31,14 +34,17 @@
 
 _ctppsDQMElastic = cms.Sequence(
     totemDAQTriggerDQMSource
-    + (totemRPDQMSource * totemRPDQMHarvester)
+    + totemRPDQMSource
     + ctppsDiamondDQMSource
     + totemTimingDQMSource
     + ctppsPixelDQMSource
     + ctppsCommonDQMSource
     + elasticPlotDQMSource
 )
 
+_ctppsDQMHarvest = cms.Sequence(totemRPDQMHarvester)
+
 from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
 ctpps_2016.toReplaceWith(ctppsDQM, _ctppsDQM)
 ctpps_2016.toReplaceWith(ctppsDQMElastic, _ctppsDQMElastic)
+ctpps_2016.toReplaceWith(ctppsDQMHarvest, _ctppsDQMHarvest)
diff --git a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
@@ -63,6 +63,7 @@
 
 process.dqmModules = cms.Sequence(
   process.ctppsDQM +
+  process.ctppsDQMHarvest +
   process.dqmEnv +
   process.dqmSaver
 )

diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -19,6 +19,7 @@
 from DQM.HcalTasks.OfflineHarvestingSequence_pp import *
 from PhysicsTools.NanoAOD.nanoDQM_cff import *
 from Validation.RecoParticleFlow.DQMForPF_MiniAOD_cff import *
+from DQM.CTPPS.ctppsDQM_cff import *
 
 DQMOffline_SecondStep_PreDPG = cms.Sequence( dqmDcsInfoClient *
                                              ecal_dqm_client_offline *
@@ -137,7 +138,7 @@
 
 DQMHarvestLumi = cms.Sequence()
 
-DQMHarvestCTPPS = cms.Sequence()
+DQMHarvestCTPPS = cms.Sequence(ctppsDQMHarvest)
 
 DQMHarvestMuon = cms.Sequence( dtClients *
                                rpcTier0Client *