backport of 46662

cms-sw · Nov 18, 2024 · 42496d3 · 42496d3
1 parent e7fd82e
commit 42496d3
Show file tree

Hide file tree

Showing 46 changed files with 151 additions and 151 deletions.
diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -56,8 +56,8 @@
 process.dqmEnv.subSystemFolder = 'BeamMonitorLegacy'
 process.dqmSaver.tag           = 'BeamMonitorLegacy'
 process.dqmSaver.runNumber     = options.runNumber
-process.dqmSaverPB.tag         = 'BeamMonitorLegacy'
-process.dqmSaverPB.runNumber   = options.runNumber
+# process.dqmSaverPB.tag         = 'BeamMonitorLegacy'
+# process.dqmSaverPB.runNumber   = options.runNumber
 
 process.dqmEnvPixelLess = process.dqmEnv.clone(
   subSystemFolder = 'BeamMonitor_PixelLess'
@@ -252,7 +252,7 @@
 
 #
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver*process.dqmSaverPB)
+                               * process.dqmSaver)#*process.dqmSaverPB)
 
 #
 process.monitor = cms.Sequence(process.dqmBeamMonitor

diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py
@@ -61,8 +61,8 @@
 process.dqmEnv.subSystemFolder = 'FakeBeamMonitorLegacy'
 process.dqmSaver.tag           = 'FakeBeamMonitorLegacy'
 process.dqmSaver.runNumber     = options.runNumber
-process.dqmSaverPB.tag         = 'FakeBeamMonitorLegacy'
-process.dqmSaverPB.runNumber   = options.runNumber
+# process.dqmSaverPB.tag         = 'FakeBeamMonitorLegacy'
+# process.dqmSaverPB.runNumber   = options.runNumber
 
 # Configure tag and jobName if running Playback system
 if process.isDqmPlayback.value :
@@ -100,7 +100,7 @@
 #-----------------
 
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver * process.dqmSaverPB)
+                               * process.dqmSaver )#* process.dqmSaverPB)
 
 #
 process.monitor = cms.Sequence(process.dqmFakeBeamMonitor

diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
@@ -85,8 +85,8 @@
 process.dqmEnv.subSystemFolder = 'BeamMonitorHLT'
 process.dqmSaver.tag           = 'BeamMonitorHLT'
 process.dqmSaver.runNumber     = options.runNumber
-process.dqmSaverPB.tag         = 'BeamMonitorHLT'
-process.dqmSaverPB.runNumber   = options.runNumber
+# process.dqmSaverPB.tag         = 'BeamMonitorHLT'
+# process.dqmSaverPB.runNumber   = options.runNumber
 
 # Configure tag and jobName if running Playback system
 if process.isDqmPlayback.value :
@@ -124,7 +124,7 @@
   process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmdev/BeamMonitorDQM/BeamFitResults.txt'
 
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver*process.dqmSaverPB)
+                               * process.dqmSaver)#*process.dqmSaverPB)
 
 process.monitor = cms.Sequence(process.dqmBeamMonitor)
 

diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py
@@ -53,8 +53,8 @@
 process.dqmEnv.subSystemFolder = 'FakeBeamMonitorHLT'
 process.dqmSaver.tag           = 'FakeBeamMonitorHLT'
 process.dqmSaver.runNumber     = options.runNumber
-process.dqmSaverPB.tag         = 'FakeBeamMonitorHLT'
-process.dqmSaverPB.runNumber   = options.runNumber
+# process.dqmSaverPB.tag         = 'FakeBeamMonitorHLT'
+# process.dqmSaverPB.runNumber   = options.runNumber
 
 # Configure tag and jobName if running Playback system
 if process.isDqmPlayback.value :
@@ -94,7 +94,7 @@
 # Condition for P5 cluster
 #process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver * process.dqmSaverPB)
+                               * process.dqmSaver )#* process.dqmSaverPB)
 
 process.monitor = cms.Sequence(process.dqmBeamMonitor)
 

diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
@@ -42,8 +42,8 @@
 process.dqmEnv.subSystemFolder = "BeamPixel"
 process.dqmSaver.tag = "BeamPixel"
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'BeamPixel'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'BeamPixel'
+# process.dqmSaverPB.runNumber = options.runNumber
 
 #----------------------------
 # Conditions
@@ -67,7 +67,7 @@
 #----------------------------
 # Define Sequences
 #----------------------------
-process.dqmModules  = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)
+process.dqmModules  = cms.Sequence(process.dqmEnv + process.dqmSaver )#+ process.dqmSaverPB)
 process.physTrigger = cms.Sequence(process.hltTriggerTypeFilter)
 
 

diff --git a/DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py b/DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py
@@ -23,8 +23,8 @@
 process.dqmEnv.eventInfoFolder = 'EventInfo'
 process.dqmSaver.tag = 'BRIL'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'BRIL'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'BRIL'
+# process.dqmSaverPB.runNumber = options.runNumber
 #-----------------------------
 
 if process.dqmRunConfig.type.value() == "production":
@@ -39,6 +39,6 @@
 process.BrilClient = DQMEDHarvester("BrilClient")
 
 process.bril_path = cms.Path(process.BrilClient)
-process.p = cms.EndPath(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)
+process.p = cms.EndPath(process.dqmEnv + process.dqmSaver )#+ process.dqmSaverPB)
 
 process.schedule = cms.Schedule(process.bril_path, process.p)
diff --git a/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py
@@ -35,8 +35,8 @@
 process.dqmEnv.subSystemFolder = "Castor"
 process.dqmSaver.tag = "Castor"
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = "Castor"
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = "Castor"
+# process.dqmSaverPB.runNumber = options.runNumber
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 
@@ -116,9 +116,9 @@
 # castorreco    -> CastorSimpleReconstructor_cfi
 # castorMonitor -> CastorMonitorModule_cfi
 
-process.p = cms.Path(process.castorDigis*process.castorreco*process.castorMonitor*process.dqmEnv*process.dqmSaver*process.dqmSaverPB)
-#process.p = cms.Path(process.castorDigis*process.castorMonitor*process.dqmEnv*process.dqmSaver*process.dqmSaverPB)
-#process.p = cms.Path(process.castorMonitor*process.dqmEnv*process.dqmSaver*process.dqmSaverPB)
+process.p = cms.Path(process.castorDigis*process.castorreco*process.castorMonitor*process.dqmEnv*process.dqmSaver)#*process.dqmSaverPB)
+#process.p = cms.Path(process.castorDigis*process.castorMonitor*process.dqmEnv*process.dqmSaver)#*process.dqmSaverPB)
+#process.p = cms.Path(process.castorMonitor*process.dqmEnv*process.dqmSaver)#*process.dqmSaverPB)
 
 
 process.castorDigis.InputLabel = "rawDataCollector"

diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py
@@ -63,8 +63,8 @@
 process.dqmEnv.subSystemFolder    = "CSC"
 process.dqmSaver.tag = "CSC"
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = "CSC"
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = "CSC"
+# process.dqmSaverPB.runNumber = options.runNumber
 
 
 #process.DQM.collectorHost = 'pccmsdqm02.cern.ch'
@@ -173,8 +173,8 @@
 # Sequences
 #--------------------------
 
-#process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver+process.dqmSaverPB)
-process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver + process.dqmSaverPB)
+#process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver)#+process.dqmSaverPB)
+process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver )#+ process.dqmSaverPB)
 
 
 process.castorDigis.InputLabel = "rawDataCollector"

diff --git a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
@@ -37,12 +37,12 @@
 process.dqmEnv.subSystemFolder = 'CTPPS'
 process.dqmSaver.tag = 'CTPPS'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'CTPPS'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'CTPPS'
+# process.dqmSaverPB.runNumber = options.runNumber
 
 if test:
   process.dqmSaver.path = "."
-  process.dqmSaverPB.path = "./pb"
+  # process.dqmSaverPB.path = "./pb"
 
 process.load("DQMServices.Components.DQMProvInfo_cfi")
 
@@ -94,8 +94,8 @@
   #process.dqmModulesCalibration *
 
   process.dqmEnv *
-  process.dqmSaver *
-  process.dqmSaverPB
+  process.dqmSaver # *
+  # process.dqmSaverPB
 )
 
 process.schedule = cms.Schedule(process.path)

diff --git a/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py
@@ -36,8 +36,8 @@
 process.dqmEnv.subSystemFolder = 'DT'
 process.dqmSaver.tag = "DT"
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = "DT"
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = "DT"
+# process.dqmSaverPB.runNumber = options.runNumber
 #-----------------------------
 
 ### CUSTOMIZE FOR ML
@@ -55,7 +55,7 @@
 process.dqmSaver.keepBackupLumi = True
 
 process.dqmSaver.path = filePath
-process.dqmSaverPB.path = filePath + "/pb"
+# process.dqmSaverPB.path = filePath + "/pb"
 
 # disable DQM gui
 print("old:",process.DQM.collectorHost)
@@ -79,7 +79,7 @@
                                     cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING'))
                                     )
 
-process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)
+process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver )#+ process.dqmSaverPB)
 
 process.dtDQMPathPhys = cms.Path(process.unpackers + process.dqmmodules + process.physicsEventsFilter *  process.dtDQMPhysSequence)
 

diff --git a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py
@@ -35,8 +35,8 @@
 process.dqmEnv.subSystemFolder = 'DT'
 process.dqmSaver.tag = "DT"
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = "DT"
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = "DT"
+# process.dqmSaverPB.runNumber = options.runNumber
 #-----------------------------
 
 #Enable HLT*Mu* filtering to monitor on Muon events
@@ -60,7 +60,7 @@
                                     cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING'))
                                     )
 
-process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)
+process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver )#+ process.dqmSaverPB)
 
 process.dtDQMPathPhys = cms.Path(process.unpackers + process.dqmmodules + process.physicsEventsFilter *  process.dtDQMPhysSequence)
 

diff --git a/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py
@@ -141,8 +141,8 @@
 process.dqmEnv.subSystemFolder = 'Ecal'
 process.dqmSaver.tag = 'Ecal'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'Ecal'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'Ecal'
+# process.dqmSaverPB.runNumber = options.runNumber
 
 process.simEcalTriggerPrimitiveDigis.InstanceEB = "ebDigis"
 process.simEcalTriggerPrimitiveDigis.InstanceEE = "eeDigis"
@@ -174,7 +174,7 @@
 process.ecalClientPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalPhysicsFilter+process.ecalMonitorClient)
 
 process.dqmEndPath = cms.EndPath(process.dqmEnv)
-process.dqmOutputPath = cms.EndPath(process.dqmSaver + process.dqmSaverPB)
+process.dqmOutputPath = cms.EndPath(process.dqmSaver )#+ process.dqmSaverPB)
 
 ### Schedule ###
 

diff --git a/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py
@@ -190,8 +190,8 @@
 process.dqmEnv.subSystemFolder = 'EcalCalibration'
 process.dqmSaver.tag = 'EcalCalibration'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'EcalCalibration'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'EcalCalibration'
+# process.dqmSaverPB.runNumber = options.runNumber
 
 ### Sequences ###
 
@@ -206,7 +206,7 @@
 process.ecalClientPath = cms.Path(process.ecalCalibMonitorClient)
 
 process.dqmEndPath = cms.EndPath(process.dqmEnv)
-process.dqmOutputPath = cms.EndPath(process.dqmSaver + process.dqmSaverPB)
+process.dqmOutputPath = cms.EndPath(process.dqmSaver )#+ process.dqmSaverPB)
 
 ### Schedule ###
 

diff --git a/DQM/Integration/python/clients/ecalgpu_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ecalgpu_dqm_sourceclient-live_cfg.py
@@ -65,8 +65,8 @@
 process.dqmEnv.subSystemFolder = 'Ecal'
 process.dqmSaver.tag = 'EcalGPU'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'EcalGPU'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'EcalGPU'
+# process.dqmSaverPB.runNumber = options.runNumber
 
 process.ecalGpuTask.params.runGpuTask = True
 process.ecalGpuTask.params.enableRecHit = False
@@ -95,7 +95,7 @@
 
 process.ecalMonitorPath = cms.Path(process.preScaler+process.ecalMonitorTask)
 process.dqmEndPath = cms.EndPath(process.dqmEnv)
-process.dqmOutputPath = cms.EndPath(process.dqmSaver + process.dqmSaverPB)
+process.dqmOutputPath = cms.EndPath(process.dqmSaver )#+ process.dqmSaverPB)
 
 ### Schedule ###
 

diff --git a/DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py
@@ -53,11 +53,11 @@
 process.dqmEnv.subSystemFolder = 'EcalPreshower'
 process.dqmSaver.tag = 'EcalPreshower'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'EcalPreshower'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'EcalPreshower'
+# process.dqmSaverPB.runNumber = options.runNumber
 # for local test
 #process.dqmSaver.path = '.'
-#process.dqmSaverPB.path = './pb'
+## process.dqmSaverPB.path = './pb'
 
 process.load("DQM/EcalPreshowerMonitorModule/EcalPreshowerMonitorTasks_cfi")
 process.ecalPreshowerIntegrityTask.ESDCCCollections = "esRawToDigi"
@@ -78,8 +78,8 @@
                process.ecalPreshowerDefaultTasksSequence*
                process.dqmEnv*
                process.ecalPreshowerMonitorClient*
-               process.dqmSaver*
-               process.dqmSaverPB)
+               process.dqmSaver)#*
+               #process.dqmSaverPB)
 
 
 process.esRawToDigi.sourceTag = "rawDataCollector"

diff --git a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py
@@ -34,8 +34,8 @@
 process.dqmEnv.subSystemFolder = 'FED'
 process.dqmSaver.tag = 'FED'
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = 'FED'
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = 'FED'
+# process.dqmSaverPB.runNumber = options.runNumber
 
 # Subsystem sequences
 
@@ -153,7 +153,7 @@
 process.DQMmodulesPath = cms.Path(
                                     process.dqmEnv
                                   + process.dqmSaver
-                                  + process.dqmSaverPB
+                                  #+ process.dqmSaverPB
                                  )
 
 process.schedule = cms.Schedule(

diff --git a/DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py
@@ -22,8 +22,8 @@
 process.dqmEnv.subSystemFolder = "GEM"
 process.dqmSaver.tag = "GEM"
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = "GEM"
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = "GEM"
+# process.dqmSaverPB.runNumber = options.runNumber
 
 process.load("DQMServices.Components.DQMProvInfo_cfi")
 
@@ -71,8 +71,8 @@
 
 process.end_path = cms.EndPath(
     process.dqmEnv +
-    process.dqmSaver +
-    process.dqmSaverPB
+    process.dqmSaver #+
+    # process.dqmSaverPB
 )
 
 process.schedule = cms.Schedule(

diff --git a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
@@ -54,8 +54,8 @@
 process.dqmEnv.subSystemFolder = subsystem
 process.dqmSaver.tag = subsystem
 process.dqmSaver.runNumber = options.runNumber
-process.dqmSaverPB.tag = subsystem
-process.dqmSaverPB.runNumber = options.runNumber
+# process.dqmSaverPB.tag = subsystem
+# process.dqmSaverPB.runNumber = options.runNumber
 process = customise(process)
 process.DQMStore.verbose = 0
 
@@ -229,7 +229,7 @@
 		process.dqmEnv)
 process.dqmPath1 = cms.EndPath(
 		process.dqmSaver
-		*process.dqmSaverPB
+		#*process.dqmSaverPB
 )
 process.qtPath = cms.Path(process.hcalQualityTests)