From 690220c1a72efa93ab85ee078c81b19fe0862e68 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 6 Jun 2022 19:04:08 +0200 Subject: [PATCH 1/6] add isDqmPlayback & isDqmProduction --- DQM/Integration/python/config/environment_cfi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DQM/Integration/python/config/environment_cfi.py b/DQM/Integration/python/config/environment_cfi.py index 5b61f72f9c32d..92a60b0459c76 100644 --- a/DQM/Integration/python/config/environment_cfi.py +++ b/DQM/Integration/python/config/environment_cfi.py @@ -42,6 +42,9 @@ def loadDQMRunConfigFromFile(): dqmRunConfigType = "userarea" if dqmFileConfig.has_option("host", "type"): dqmRunConfigType = dqmFileConfig.get("host", "type") + +isDqmPlayback = cms.PSet( value = cms.untracked.bool( dqmRunConfigType != "playback" ) ) +isDqmProduction = cms.PSet( value = cms.untracked.bool( dqmRunConfigType != "production" ) ) dqmRunConfig = dqmRunConfigDefaults[dqmRunConfigType] @@ -52,7 +55,6 @@ def loadDQMRunConfigFromFile(): if dqmFileConfig.has_option("host", "collectorHost"): dqmRunConfig.collectorHost = dqmFileConfig.get("host", "collectorHost") - # now start the actual configuration print("dqmRunConfig:", dqmRunConfig) From 073b71fd2713f23d2e60bcfd70a1fe15b1eaf955 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 6 Jun 2022 19:05:09 +0200 Subject: [PATCH 2/6] Update environment_cfi.py --- DQM/Integration/python/config/environment_cfi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DQM/Integration/python/config/environment_cfi.py b/DQM/Integration/python/config/environment_cfi.py index 92a60b0459c76..cc93abe9b7b96 100644 --- a/DQM/Integration/python/config/environment_cfi.py +++ b/DQM/Integration/python/config/environment_cfi.py @@ -43,8 +43,8 @@ def loadDQMRunConfigFromFile(): if dqmFileConfig.has_option("host", "type"): dqmRunConfigType = dqmFileConfig.get("host", "type") -isDqmPlayback = cms.PSet( value = cms.untracked.bool( dqmRunConfigType != "playback" ) ) -isDqmProduction = cms.PSet( value = cms.untracked.bool( dqmRunConfigType != "production" ) ) +isDqmPlayback = cms.PSet( value = cms.untracked.bool( dqmRunConfigType == "playback" ) ) +isDqmProduction = cms.PSet( value = cms.untracked.bool( dqmRunConfigType == "production" ) ) dqmRunConfig = dqmRunConfigDefaults[dqmRunConfigType] From d5c5dbadb818115c45d100dd7c8fcc5bad5405b1 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 6 Jun 2022 19:05:52 +0200 Subject: [PATCH 3/6] Update beam_dqm_sourceclient-live_cfg.py --- .../clients/beam_dqm_sourceclient-live_cfg.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 index 180b84e2c8406..ee76d38fd0271 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -13,13 +13,6 @@ from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("BeamMonitor", Run3) -# Configure tag and jobName if running Playback system -if "dqm_cmssw/playback" in str(sys.argv[1]): - BSOnlineTag = BSOnlineTag + 'Playback' - BSOnlineJobName = BSOnlineJobName + 'Playback' - BSOnlineOmsServiceUrl = '' - useLockRecords = False -# process.MessageLogger = cms.Service("MessageLogger", debugModules = cms.untracked.vstring('*'), cerr = cms.untracked.PSet( @@ -68,6 +61,14 @@ subSystemFolder = 'BeamMonitor_PixelLess' ) +# Configure tag and jobName if running Playback system +if process.isDqmPlayback.value : + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + BSOnlineOmsServiceUrl = '' + useLockRecords = False +# + #--------------- # Conditions if (live): From 96997f996232aadf1868cc4edfaedd414b5094a4 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 6 Jun 2022 19:06:40 +0200 Subject: [PATCH 4/6] Update beamfake_dqm_sourceclient-live_cfg.py --- .../clients/beamfake_dqm_sourceclient-live_cfg.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py index 73847244348a8..b23329f3dcd7a 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -13,14 +13,6 @@ from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("FakeBeamMonitor", Run3) -# Configure tag and jobName if running Playback system -if "dqm_cmssw/playback" in str(sys.argv[1]): - BSOnlineTag = BSOnlineTag + 'Playback' - BSOnlineJobName = BSOnlineJobName + 'Playback' - BSOnlineOmsServiceUrl = '' - useLockRecords = False - -# process.MessageLogger = cms.Service("MessageLogger", debugModules = cms.untracked.vstring('*'), cerr = cms.untracked.PSet( @@ -68,6 +60,12 @@ process.dqmSaverPB.tag = 'FakeBeamMonitorLegacy' process.dqmSaverPB.runNumber = options.runNumber +# Configure tag and jobName if running Playback system +if process.isDqmPlayback.value : + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + BSOnlineOmsServiceUrl = '' + useLockRecords = False #--------------- """ From 0b895254a0ef591f593f2ea12b60f095e5c14be9 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 6 Jun 2022 19:07:48 +0200 Subject: [PATCH 5/6] Update beamhlt_dqm_sourceclient-live_cfg.py --- .../clients/beamhlt_dqm_sourceclient-live_cfg.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index 21a8e3806e5b1..4ba0701c89c90 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -13,13 +13,6 @@ from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("BeamMonitor", Run3) -# Configure tag and jobName if running Playback system -if "dqm_cmssw/playback" in str(sys.argv[1]): - BSOnlineTag = BSOnlineTag + 'Playback' - BSOnlineJobName = BSOnlineJobName + 'Playback' - BSOnlineOmsServiceUrl = '' - useLockRecords = False - # Message logger #process.load("FWCore.MessageLogger.MessageLogger_cfi") #process.MessageLogger = cms.Service("MessageLogger", @@ -104,6 +97,13 @@ process.dqmSaverPB.tag = 'BeamMonitorHLT' process.dqmSaverPB.runNumber = options.runNumber +# Configure tag and jobName if running Playback system +if process.isDqmPlayback.value : + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + BSOnlineOmsServiceUrl = '' + useLockRecords = False + #----------------------------- # BeamMonitor #----------------------------- From 2eade3daf1f145c13c609a6fe1507d57cbf30cc7 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 6 Jun 2022 19:08:21 +0200 Subject: [PATCH 6/6] Update beamhltfake_dqm_sourceclient-live_cfg.py --- .../beamhltfake_dqm_sourceclient-live_cfg.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py index f03bba75bf456..c64a712f31ea7 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -13,13 +13,6 @@ from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("FakeBeamMonitor", Run3) -# Configure tag and jobName if running Playback system -if "dqm_cmssw/playback" in str(sys.argv[1]): - BSOnlineTag = BSOnlineTag + 'Playback' - BSOnlineJobName = BSOnlineJobName + 'Playback' - BSOnlineOmsServiceUrl = '' - useLockRecords = False - # switch live = True # FIXME unitTest = False @@ -66,6 +59,13 @@ process.dqmSaverPB.tag = 'FakeBeamMonitorHLT' process.dqmSaverPB.runNumber = options.runNumber +# Configure tag and jobName if running Playback system +if process.isDqmPlayback.value : + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + BSOnlineOmsServiceUrl = '' + useLockRecords = False + #--------------- """ # Conditions