From 950e34ebb69295cea0d4c4d1b6ed3086a67ba4cd Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Tue, 3 Jan 2023 16:51:24 +0100 Subject: [PATCH 1/2] bugfix DQM clients process names --- .../python/clients/beam_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/beamfake_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/beamhltfake_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/beampixel_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/physics_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/pixel_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/pixellumi_dqm_sourceclient-live_cfg.py | 4 ++-- 8 files changed, 16 insertions(+), 16 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 ec1795c5260a9..fde60eb802425 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -12,10 +12,10 @@ import sys if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("BeamMonitorLegacy", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("BeamMonitorLegacy", Run3) process.MessageLogger = cms.Service("MessageLogger", debugModules = cms.untracked.vstring('*'), 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 d5b5287cb9826..2663d38c97563 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -12,10 +12,10 @@ import sys if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("FakeBeamMonitorLegacy", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("FakeBeamMonitorLegacy", Run3) process.MessageLogger = cms.Service("MessageLogger", debugModules = cms.untracked.vstring('*'), 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 815175a0f6c43..48cd2447356dd 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -12,10 +12,10 @@ import sys if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("BeamMonitorHLT", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("BeamMonitorHLT", Run3) # Message logger 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 19b0e81f048f8..5f46124512b45 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -12,10 +12,10 @@ import sys if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("FakeBeamMonitorHLT", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("FakeBeamMonitorHLT", Run3) # switch live = True # FIXME diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index fd73b2073e0ce..1e990f8318baf 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -4,10 +4,10 @@ import sys if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("BeamPixel", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("BeamPixel", Run3) unitTest = False if 'unitTest=True' in sys.argv: 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 d6eb245118678..bda74ece1e81d 100644 --- a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py @@ -5,10 +5,10 @@ if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("Physics", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("Physics", Run3) #---------------------------- # Event Source diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py index cda882ae7e7b7..5a0d3121ed411 100644 --- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py @@ -4,10 +4,10 @@ import sys if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("PIXELDQMLIVE", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("PIXELDQMLIVE", Run3) live=True unitTest = False 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 97d809f839ed9..2e62f7a11c78e 100644 --- a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py @@ -4,10 +4,10 @@ if 'runkey=hi_run' in sys.argv: from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) + process = cms.Process("PixelLumiDQM", Run3_pp_on_PbPb_approxSiStripClusters) else: from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) + process = cms.Process("PixelLumiDQM", Run3) unitTest=False if 'unitTest=True' in sys.argv: From b6087e1ae9ea10db37da1c9c69021ffe5d2eb45a Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Tue, 3 Jan 2023 16:52:07 +0100 Subject: [PATCH 2/2] remove unused sistriplas_dqm_sourceclient --- .../sistriplas_dqm_sourceclient-live_cfg.py | 81 ------------------- 1 file changed, 81 deletions(-) delete mode 100644 DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py diff --git a/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py deleted file mode 100644 index 8a9af882c6440..0000000000000 --- a/DQM/Integration/python/clients/sistriplas_dqm_sourceclient-live_cfg.py +++ /dev/null @@ -1,81 +0,0 @@ -from __future__ import print_function -import FWCore.ParameterSet.Config as cms - -if 'runkey=hi_run' in sys.argv: - from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters - process = cms.Process("BeamMonitor", Run3_pp_on_PbPb_approxSiStripClusters) -else: - from Configuration.Eras.Era_Run3_cff import Run3 - process = cms.Process("BeamMonitor", Run3) - -process.MessageLogger = cms.Service( "MessageLogger", - cout = cms.untracked.PSet(threshold = cms.untracked.string( 'ERROR' )), - destinations = cms.untracked.vstring( 'cout') -) -#---------------------------- -# Event Source -#----------------------------- -# for live online DQM in P5 -#process.load("DQM.Integration.config.inputsource_cfi") -#from DQM.Integration.config.inputsource_cfi import options - -# for testing in lxplus -process.load("DQM.Integration.config.fileinputsource_cfi") -from DQM.Integration.config.fileinputsource_cfi import options - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32( -1 ) -) - -process.load( "EventFilter.SiStripRawToDigi.SiStripDigis_cfi" ) -process.siStripDigis.ProductLabel = "source"#"hltCalibrationRaw" -#-------------------------- -# Calibration -#-------------------------- -# Condition for P5 cluster -process.load("DQM.Integration.config.FrontierCondition_GT_cfi") -# Condition for lxplus: change and possibly customise the GT -#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise -#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '') - -#---------------------------- -# DQM Live Environment -#----------------------------- -process.load("DQM.Integration.config.environment_cfi") -process.dqmEnv.subSystemFolder = "SiStripLAS" -process.dqmSaver.tag = "SiStripLAS" -process.dqmSaver.runNumber = options.runNumber -process.dqmSaverPB.tag = "SiStripLAS" -process.dqmSaverPB.runNumber = options.runNumber -#---------------------------- -# DQM Alignment Software -#---------------------------- -process.load( "DQM.SiStripLASMonitor.LaserAlignmentProducerDQM_cfi" ) -process.LaserAlignmentProducerDQM.DigiProducerList = cms.VPSet( - cms.PSet( - DigiLabel = cms.string( 'ZeroSuppressed' ), - DigiType = cms.string( 'Processed' ), - DigiProducer = cms.string( 'siStripDigis' ) - ) -) -process.LaserAlignmentProducerDQM.FolderName = "SiStripLAS" -process.LaserAlignmentProducerDQM.UpperAdcThreshold = 280 - -process.seqDigitization = cms.Path( process.siStripDigis ) -process.DQMCommon = cms.Sequence(process.dqmEnv*process.dqmSaver*process.dqmSaverPB) - -process.seqAnalysis = cms.Path( process.LaserAlignmentProducerDQM*process.DQMCommon) -process.siStripDigis.ProductLabel = "hltTrackerCalibrationRaw" -#-------------------------------------------------- -# Heavy Ion Specific Fed Raw Data Collection Label -#-------------------------------------------------- - -print("Running with run type = ", process.runType.getRunType()) - -if (process.runType.getRunType() == process.runType.hi_run): - process.siStripDigis.ProductLabel = "rawDataRepacker" - - -### process customizations included here -from DQM.Integration.config.online_customizations_cfi import * -process = customise(process)