From ca15bb6e9cffda93dfb91e15b56c65e89b2e4458 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Sun, 27 Feb 2022 17:17:47 +0100 Subject: [PATCH 1/2] migrate processes to Run3 --- .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 2 -- .../python/clients/beamspotdip_dqm_sourceclient-live_cfg.py | 3 ++- DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py | 3 ++- .../python/clients/castor_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/csc_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/dt4ml_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/dt_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/es_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/fed_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/gem_dqm_sourceclient-live_cfg.py | 4 ++-- DQM/Integration/python/clients/hlt_dqm_clientPB-live_cfg.py | 3 ++- .../python/clients/hltrates_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/hlx_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/info_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/l1t_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/l1temulator_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/l1tstage1_dqm_sourceclient-live_cfg.py | 3 ++- .../clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/lumi_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/mutracking_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/physics_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/pixellumi_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/ramdisk_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/rpc_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/scal_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/sistriplas_dqm_sourceclient-live_cfg.py | 3 ++- 26 files changed, 50 insertions(+), 28 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 00925f2320f23..e69c3073ce9ca 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -9,8 +9,6 @@ BSOnlineOmsServiceUrl = 'http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection' useLockRecords = True -#from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 -#process = cms.Process("BeamMonitor", Run2_2018) # FIMXE import sys from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("BeamMonitor", Run3) diff --git a/DQM/Integration/python/clients/beamspotdip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamspotdip_dqm_sourceclient-live_cfg.py index 4af10da2a8d20..0f1673261455a 100644 --- a/DQM/Integration/python/clients/beamspotdip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamspotdip_dqm_sourceclient-live_cfg.py @@ -10,7 +10,8 @@ copy(configFile,".") # -process = cms.Process("BeamSpotDipServer") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("BeamSpotDipServer", Run3) process.load("DQMServices.Core.DQM_cfg") # message logger diff --git a/DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py b/DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py index 2331672926f56..24f2be84b3f39 100644 --- a/DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py +++ b/DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py @@ -2,7 +2,8 @@ import FWCore.ParameterSet.Config as cms from DQMServices.Core.DQMEDHarvester import DQMEDHarvester -process = cms.Process("HARVESTING") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("HARVESTING", Run3) #---------------------------- #### Histograms Source diff --git a/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py index 3c9ba334c2c96..bce9734dcd8a5 100644 --- a/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("CASTORDQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("CASTORDQM", Run3) unitTest=False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py index 0a2915a1be984..8e2bac4620bd2 100644 --- a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("CSCDQMLIVE") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("CSCDQMLIVE", Run3) #------------------------------------------------- # DQM Module Configuration diff --git a/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py index f68e01817f44d..8f30f7440b3e9 100644 --- a/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py @@ -3,7 +3,8 @@ import sys import os -process = cms.Process("DTDQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DTDQM", Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py index 0001acf61064b..0b0131d4af564 100644 --- a/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("DTDQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DTDQM", Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py index 868f9119170f6..01d647efc3e15 100644 --- a/DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("ESDQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("ESDQM", Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py index 4264ac93ab9d5..1080d7c7d35cc 100644 --- a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import sys # Process initialization -process = cms.Process('FED') +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process('FED', Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py index 8729da504bc58..f520d2b15c8db 100644 --- a/DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/gem_dqm_sourceclient-live_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms import sys -from Configuration.StandardSequences.Eras import eras -process = cms.Process('GEMDQM', eras.Run3) +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process('GEMDQM', Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/hlt_dqm_clientPB-live_cfg.py b/DQM/Integration/python/clients/hlt_dqm_clientPB-live_cfg.py index 200f38f849d69..b56816fd41051 100644 --- a/DQM/Integration/python/clients/hlt_dqm_clientPB-live_cfg.py +++ b/DQM/Integration/python/clients/hlt_dqm_clientPB-live_cfg.py @@ -1,7 +1,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("HARVESTING") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("HARVESTING", Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/hltrates_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hltrates_dqm_sourceclient-live_cfg.py index a5075a08badb1..21d1fe758f506 100644 --- a/DQM/Integration/python/clients/hltrates_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hltrates_dqm_sourceclient-live_cfg.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("DQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DQM", Run3) process.options = cms.untracked.PSet( SkipEvent = cms.untracked.vstring('ProductNotFound') ) diff --git a/DQM/Integration/python/clients/hlx_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hlx_dqm_sourceclient-live_cfg.py index 4720023ff4967..b29ea99e02206 100644 --- a/DQM/Integration/python/clients/hlx_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hlx_dqm_sourceclient-live_cfg.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("hlxdqmlive") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("hlxdqmlive", Run3) from FWCore.MessageLogger.MessageLogger_cfi import * diff --git a/DQM/Integration/python/clients/info_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/info_dqm_sourceclient-live_cfg.py index bab64c29a006e..a606e82fddaa4 100644 --- a/DQM/Integration/python/clients/info_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/info_dqm_sourceclient-live_cfg.py @@ -1,7 +1,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("DQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DQM", Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py index 4c71aa4dcc9df..c1253367a3456 100644 --- a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py @@ -8,7 +8,8 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("DQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DQM", Run3) #---------------------------- diff --git a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py index 9956e32f1385b..c909210ab794f 100644 --- a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py @@ -8,7 +8,8 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("L1TEmuDQMlive") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("L1TEmuDQMlive", Run3) #---------------------------- diff --git a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py index 115f29ae5973d..a633c807607e2 100644 --- a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py @@ -8,7 +8,8 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("DQM") +nano from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DQM", Run3) #---------------------------- diff --git a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py index 06195a300f94e..f611e85e160ab 100644 --- a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py @@ -8,7 +8,8 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("L1TEmuDQMlive") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("L1TEmuDQMlive", Run3) #---------------------------- diff --git a/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py index e439454513880..ea863855d66bc 100644 --- a/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("DQMLumi") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DQMLumi", Run3) process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 1000 diff --git a/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py index def262433037a..7d2bcf8774ce3 100644 --- a/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py @@ -3,7 +3,8 @@ import sys from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA -process = cms.Process("MUTRKDQM", Run2_2018_pp_on_AA) +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("MUTRKDQM", Run3) live=True unitTest=False diff --git a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py index 8cffb12d1bf6b..3035453b2732f 100644 --- a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py @@ -3,7 +3,8 @@ import FWCore.ParameterSet.Config as cms -process = cms.Process("Physics") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("Physics", Run3) #---------------------------- # Event Source diff --git a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py index 619a9f77ec155..eecd4ad785d6a 100644 --- a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("PixelLumiDQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("PixelLumiDQM", Run3) unitTest=False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/ramdisk_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ramdisk_dqm_sourceclient-live_cfg.py index b4878faae10cf..ef24c64d778bf 100644 --- a/DQM/Integration/python/clients/ramdisk_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/ramdisk_dqm_sourceclient-live_cfg.py @@ -2,7 +2,8 @@ import sys subsystem = "Ramdisk" -process = cms.Process(subsystem) +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process(subsystem, Run3) import FWCore.ParameterSet.Config as cms import FWCore.ParameterSet.VarParsing as VarParsing diff --git a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py index 0c84f0ca17f36..38e8ae6eb905a 100644 --- a/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/rpc_dqm_sourceclient-live_cfg.py @@ -11,7 +11,8 @@ if 'unitTest=True' in sys.argv: unitTest=True -process = cms.Process("RPCDQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("RPCDQM", Run3) ############## Event Source ##################### diff --git a/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py index 3aca30e0fa20d..8388d384151ec 100644 --- a/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py @@ -1,7 +1,8 @@ import FWCore.ParameterSet.Config as cms import sys -process = cms.Process("DQM") +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("DQM", Run3) unitTest = False if 'unitTest=True' in sys.argv: diff --git a/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py index 2833f4b9cdbf1..e56e7c7f26c31 100644 --- a/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py @@ -1,7 +1,8 @@ from __future__ import print_function import FWCore.ParameterSet.Config as cms -process = cms.Process( "sistriplaserDQMLive" ) +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process( "sistriplaserDQMLive", Run3 ) process.MessageLogger = cms.Service( "MessageLogger", cout = cms.untracked.PSet(threshold = cms.untracked.string( 'ERROR' )), destinations = cms.untracked.vstring( 'cout') From 621d1d84729d22a6ffd4d85ca1f9eb66cd8f1dc1 Mon Sep 17 00:00:00 2001 From: pmandrik Date: Mon, 28 Feb 2022 12:40:42 +0300 Subject: [PATCH 2/2] fix typo --- .../python/clients/l1tstage1_dqm_sourceclient-live_cfg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py index a633c807607e2..c3176f1215bcf 100644 --- a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py @@ -8,7 +8,7 @@ import FWCore.ParameterSet.Config as cms -nano from Configuration.Eras.Era_Run3_cff import Run3 +from Configuration.Eras.Era_Run3_cff import Run3 process = cms.Process("DQM", Run3)