Skip to content

Commit b5cbc65

Browse files
authored
Merge pull request #47418 from mmusich/mm_dev_streamers_for_onlinebeammonitor
move unit test for `onlinebeammonitor_dqm_sourceclient-live` to use streamer files
2 parents fc1a3e5 + 04dd580 commit b5cbc65

File tree

2 files changed

+3
-71
lines changed

2 files changed

+3
-71
lines changed

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

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -26,76 +26,8 @@
2626

2727
#-----------------------------
2828
if unitTest:
29-
import FWCore.ParameterSet.VarParsing as VarParsing
30-
options = VarParsing.VarParsing("analysis")
31-
32-
options.register(
33-
"runkey",
34-
"pp_run",
35-
VarParsing.VarParsing.multiplicity.singleton,
36-
VarParsing.VarParsing.varType.string,
37-
"Run Keys of CMS"
38-
)
39-
40-
options.register('runNumber',
41-
346508,
42-
VarParsing.VarParsing.multiplicity.singleton,
43-
VarParsing.VarParsing.varType.int,
44-
"Run number. This run number has to be present in the dataset configured with the dataset option.")
45-
46-
options.register('dataset',
47-
'/ExpressPhysics/Commissioning2021-Express-v1/FEVT',
48-
VarParsing.VarParsing.multiplicity.singleton,
49-
VarParsing.VarParsing.varType.string,
50-
"Dataset name like '/ExpressCosmics/Commissioning2019-Express-v1/FEVT'")
51-
52-
options.register('maxLumi',
53-
2,
54-
VarParsing.VarParsing.multiplicity.singleton,
55-
VarParsing.VarParsing.varType.int,
56-
"Only lumisections up to maxLumi are processed.")
57-
58-
options.register('minLumi',
59-
1,
60-
VarParsing.VarParsing.multiplicity.singleton,
61-
VarParsing.VarParsing.varType.int,
62-
"Only lumisections starting from minLumi are processed.")
63-
64-
options.register('lumiPattern',
65-
'*',
66-
VarParsing.VarParsing.multiplicity.singleton,
67-
VarParsing.VarParsing.varType.string,
68-
"Only lumisections with numbers matching lumiPattern are processed.")
69-
70-
options.register('eventsPerLumi',
71-
100,
72-
VarParsing.VarParsing.multiplicity.singleton,
73-
VarParsing.VarParsing.varType.int,
74-
"This number of last events in each lumisection will be processed.")
75-
76-
# This is used only by the online clients themselves.
77-
# We need to register it here because otherwise an error occurs saying that there is an unidentified option.
78-
options.register('unitTest',
79-
True,
80-
VarParsing.VarParsing.multiplicity.singleton,
81-
VarParsing.VarParsing.varType.bool,
82-
"Required to avoid the error.")
83-
84-
options.register('noDB',
85-
True, # default value
86-
VarParsing.VarParsing.multiplicity.singleton,
87-
VarParsing.VarParsing.varType.bool,
88-
"Don't upload the BeamSpot conditions to the DB")
89-
90-
options.parseArguments()
91-
92-
process.source = cms.Source("EmptySource")
93-
process.source.numberEventsInRun=cms.untracked.uint32(100)
94-
process.source.firstRun = cms.untracked.uint32(options.runNumber)
95-
process.source.firstLuminosityBlock = cms.untracked.uint32(1)
96-
process.source.numberEventsInLuminosityBlock = cms.untracked.uint32(2)
97-
process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(100))
98-
29+
process.load("DQM.Integration.config.unitteststreamerinputsource_cfi")
30+
from DQM.Integration.config.unitteststreamerinputsource_cfi import options
9931
else:
10032
process.load("DQM.Integration.config.inputsource_cfi")
10133
from DQM.Integration.config.inputsource_cfi import options

DQM/Integration/test/BuildFile.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- <test name="TestDQMOnlineClient-scal_dqm_sourceclient" command="runtest.sh scal_dqm_sourceclient-live_cfg.py"/> -->
2525
<test name="TestDQMOnlineClient-sistrip_dqm_sourceclient" command="runtest.sh sistrip_dqm_sourceclient-live_cfg.py"/>
2626
<test name="TestDQMOnlineClient-sistrip_approx_dqm_sourceclient" command="runtest.sh sistrip_approx_dqm_sourceclient-live_cfg.py 362321 hi_run"/>
27-
<test name="TestDQMOnlineClient-onlinebeammonitor_dqm_sourceclient" command="runtest.sh onlinebeammonitor_dqm_sourceclient-live_cfg.py"/>
27+
<test name="TestDQMOnlineClient-onlinebeammonitor_dqm_sourceclient" command="runtest.sh onlinebeammonitor_dqm_sourceclient-live_cfg.py 381594 pp_run"/>
2828
<test name="TestDQMOnlineClient-ecalgpu_dqm_sourceclient" command="runtest.sh ecalgpu_dqm_sourceclient-live_cfg.py 381594"/>
2929
<test name="TestDQMOnlineClient-hcalgpu_dqm_sourceclient" command="runtest.sh hcalgpu_dqm_sourceclient-live_cfg.py 381594"/>
3030
<test name="TestDQMOnlineClient-pixelgpu_dqm_sourceclient" command="runtest.sh pixelgpu_dqm_sourceclient-live_cfg.py 381594"/>

0 commit comments

Comments
 (0)