Skip to content

Commit 46724de

Browse files
authored
Merge pull request #48705 from mmusich/mm_dev_clients_protect_inputFiles
protect online DQM clients when running in `inputFiles` mode against meaningless customizations
2 parents 9f7d963 + 452ab1e commit 46724de

7 files changed

+23
-25
lines changed

DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
process.load("DQM.Integration.config.fileinputsource_cfi")
4444
from DQM.Integration.config.fileinputsource_cfi import options
4545

46+
if (options.inputFiles):
47+
useLockRecords = False
48+
4649
#--------------------------
4750
# HLT Filter
4851
process.hltTriggerTypeFilter = cms.EDFilter("HLTTriggerTypeFilter",
@@ -377,18 +380,15 @@
377380

378381
#---------
379382
# Upload BeamSpotOnlineObject (LegacyRcd) to CondDB
380-
if unitTest == False:
381-
process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
382-
383+
if (not unitTest) and (not options.inputFiles):
384+
process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
383385
DBParameters = cms.PSet(
384-
messageLevel = cms.untracked.int32(0),
385-
authenticationPath = cms.untracked.string('.')
386-
),
387-
386+
messageLevel = cms.untracked.int32(0),
387+
authenticationPath = cms.untracked.string('.')
388+
),
388389
# Upload to CondDB
389390
connect = cms.string('oracle://cms_orcon_prod/CMS_CONDITIONS'),
390391
preLoadConnectionString = cms.untracked.string('frontier://FrontierProd/CMS_CONDITIONS'),
391-
392392
runNumber = cms.untracked.uint64(options.runNumber),
393393
omsServiceUrl = cms.untracked.string(BSOnlineOmsServiceUrl),
394394
latency = cms.untracked.uint32(2),
@@ -405,13 +405,11 @@
405405
)
406406

407407
else:
408-
process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
409-
408+
process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
410409
DBParameters = cms.PSet(
411-
messageLevel = cms.untracked.int32(0),
412-
authenticationPath = cms.untracked.string('.')
413-
),
414-
410+
messageLevel = cms.untracked.int32(0),
411+
authenticationPath = cms.untracked.string('.')
412+
),
415413
# Upload to CondDB
416414
connect = cms.string('sqlite_file:BeamSpotOnlineLegacy.db'),
417415
preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineLegacy.db'),

DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#Enable HLT*Mu* filtering to monitor on Muon events
4242
#OR HLT_Physics* to monitor FEDs in commissioning runs
43-
if not unitTest:
43+
if (not unitTest) and (not options.inputFiles):
4444
process.source.SelectEvents = cms.untracked.vstring("HLT*Mu*","HLT_*Physics*")
4545

4646
# DT reco and DQM sequences

DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
process.DQMStore.verbose = 0
6262

6363

64-
if not unitTest and not useFileInput :
64+
if (not unitTest) and (not useFileInput) and (not options.inputFiles):
6565
if not options.BeamSplashRun :
6666
process.source.minEventsPerLumi = 100
6767

DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
# process.dqmSaverPB.runNumber = options.runNumber
6868
process = customise(process)
6969
process.DQMStore.verbose = 0
70-
if not unitTest and not useFileInput:
70+
if (not unitTest) and (not useFileInput) and (not options.inputFiles):
7171
if not options.BeamSplashRun :
7272
process.source.minEventsPerLumi = 5
7373

DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
# process.dqmSaverPB.tag = "PixelLumi"
5151
# process.dqmSaverPB.runNumber = options.runNumber
5252

53-
if not unitTest:
53+
if (not unitTest) and (not options.inputFiles):
5454
process.source.SelectEvents = cms.untracked.vstring("HLT_ZeroBias*","HLT_L1AlwaysTrue*", "HLT_PAZeroBias*", "HLT_PAL1AlwaysTrue*")
5555
#if (process.runType.getRunType() == process.runType.hi_run):
5656

57-
if (process.runType.getRunType() == process.runType.cosmic_run and not unitTest):
57+
if (process.runType.getRunType() == process.runType.cosmic_run and (not unitTest) and (not options.inputFiles)):
5858
process.source.SelectEvents = ['HLT*SingleMu*']
5959

6060
#----------------------------
@@ -103,7 +103,7 @@
103103
process.load('Configuration.StandardSequences.RawToDigi_Repacked_cff')
104104
process.siPixelDigis.InputLabel = "rawDataRepacker"
105105

106-
if not unitTest:
106+
if not unitTest and (not options.inputFiles):
107107
process.source.SelectEvents = ['HLT_HIL1MinimumBiasHF2AND*']
108108

109109

DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
### COSMIC RUN SETTING
246246
if (process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1):
247247
# event selection for cosmic data
248-
if ((process.runType.getRunType() == process.runType.cosmic_run) and live): process.source.SelectEvents = ['HLT*SingleMu*','HLT_L1*']
248+
if ((process.runType.getRunType() == process.runType.cosmic_run) and live and (not options.inputFiles)): process.source.SelectEvents = ['HLT*SingleMu*','HLT_L1*']
249249
# Reference run for cosmic
250250
# Source config for cosmic data
251251
process.SiStripSources_TrkReco_cosmic = cms.Sequence(process.SiStripMonitorTrack_ckf*process.TrackMon_ckf)
@@ -304,7 +304,7 @@
304304
### COMMISSIONING RUN SETTINGS
305305
if (process.runType.getRunType() == process.runType.commissioning_run):
306306
#event selection for commissioning runs
307-
if ((process.runType.getRunType() == process.runType.commissioning_run) and live):
307+
if ((process.runType.getRunType() == process.runType.commissioning_run) and live and (not options.inputFiles)):
308308
process.source.SelectEvents = ['HLT_*']
309309

310310
process.SiStripFedMonitor = cms.Sequence(process.siStripFEDMonitor)
@@ -318,7 +318,7 @@
318318
### pp COLLISION SETTING
319319
if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1):
320320
#event selection for pp collisions
321-
if ((process.runType.getRunType() == process.runType.pp_run) and live):
321+
if ((process.runType.getRunType() == process.runType.pp_run) and live and (not options.inputFiles)):
322322
process.source.SelectEvents = [
323323
'HLT_L1*',
324324
'HLT_Jet*',
@@ -550,7 +550,7 @@
550550
process.siStripFEDMonitor.RawDataTag = rawDataRepackerLabel
551551
process.tcdsDigis.InputLabel = rawDataRepackerLabel
552552

553-
if ((process.runType.getRunType() == process.runType.hi_run) and live):
553+
if ((process.runType.getRunType() == process.runType.hi_run) and live and (not options.inputFiles)):
554554
process.source.SelectEvents = [
555555
# 'HLT_HICentralityVeto*', # present in 2018 and 2022 HIon menus
556556
'HLT_HIMinimumBias*', # replaced HLT_HICentralityVeto starting from the 2023 HIon menu

DQM/Integration/python/clients/visualization-live_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
process.source = source
6767

68-
if not unitTest:
68+
if not unitTest and (not options.inputFiles):
6969
process.source.inputFileTransitionsEachEvent = True
7070
process.source.skipFirstLumis = True
7171
process.source.minEventsPerLumi = 0

0 commit comments

Comments
 (0)