Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added new DQM GUI support to all Online DQM clients #30592

Merged
merged 10 commits into from Sep 8, 2020
Merged

Added new DQM GUI support to all Online DQM clients #30592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0cc76fb
WIP: Saving PB files every lumi in 2 Online DQM clients
Jul 8, 2020
3ce110b
Saving PB files to a folder named after a client
Jul 14, 2020
e7cb89a
No more lumi in a PB file name
Jul 15, 2020
69bd240
Zlib compressing ME blobs when saving PB files
Aug 4, 2020
741ab91
Using a run number from the configuration in Online DQM output filenames
Aug 12, 2020
cb6ffc9
Changed PB saver stream label saving new GUI live snapshots
Aug 12, 2020
a7ce140
ZLib compressing QTest MEs as well (in DQM mode)
Aug 14, 2020
a5c054a
Fixed type name
Aug 21, 2020
7a56079
Added new DQM GUI support to the rest of the clients
Aug 28, 2020
fd636bc
code-format
Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -57,6 +57,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = 'BeamMonitor'
process.dqmSaver.tag = 'BeamMonitor'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BeamMonitor'
process.dqmSaverPB.runNumber = options.runNumber

process.dqmEnvPixelLess = process.dqmEnv.clone()
process.dqmEnvPixelLess.subSystemFolder = 'BeamMonitor_PixelLess'
Expand Down Expand Up @@ -228,7 +231,7 @@

#
process.dqmcommon = cms.Sequence(process.dqmEnv
* process.dqmSaver)
* process.dqmSaver*process.dqmSaverPB)

#
process.monitor = cms.Sequence(process.dqmBeamMonitor
Expand Down
5 changes: 4 additions & 1 deletion DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -57,6 +57,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = 'FakeBeamMonitor'
process.dqmSaver.tag = 'FakeBeamMonitor'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'FakeBeamMonitor'
process.dqmSaverPB.runNumber = options.runNumber

#process.dqmEnvPixelLess = process.dqmEnv.clone()
#process.dqmEnvPixelLess.subSystemFolder = 'BeamMonitor_PixelLess'
Expand Down Expand Up @@ -229,7 +232,7 @@

#
process.dqmcommon = cms.Sequence(process.dqmEnv
* process.dqmSaver)
* process.dqmSaver*process.dqmSaverPB)

#
process.monitor = cms.Sequence(process.dqmFakeBeamMonitor
Expand Down
5 changes: 4 additions & 1 deletion DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -66,6 +66,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = 'TrackingHLTBeamspotStream'
process.dqmSaver.tag = 'TrackingHLTBeamspotStream'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'TrackingHLTBeamspotStream'
process.dqmSaverPB.runNumber = options.runNumber

#-----------------------------
# BeamMonitor
Expand Down Expand Up @@ -94,7 +97,7 @@
process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmdev/BeamMonitorDQM/BeamFitResults.txt'

process.dqmcommon = cms.Sequence(process.dqmEnv
* process.dqmSaver)
* process.dqmSaver*process.dqmSaverPB)

process.monitor = cms.Sequence(process.dqmBeamMonitor)

Expand Down
5 changes: 4 additions & 1 deletion DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -66,6 +66,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = 'FakeBeamMonitor'
process.dqmSaver.tag = 'FakeBeamMonitor'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'FakeBeamMonitor'
process.dqmSaverPB.runNumber = options.runNumber

#-----------------------------
# BeamMonitor
Expand Down Expand Up @@ -94,7 +97,7 @@
# process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmdev/BeamMonitorDQM/BeamFitResults.txt'

process.dqmcommon = cms.Sequence(process.dqmEnv
* process.dqmSaver)
* process.dqmSaver*process.dqmSaverPB)

process.monitor = cms.Sequence(process.dqmBeamMonitor)

Expand Down
9 changes: 7 additions & 2 deletions DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -15,10 +15,13 @@
#----------------------------
if unitTest == True:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
else:
process.load("DQM.Integration.config.inputsource_cfi")
from DQM.Integration.config.inputsource_cfi import options
# Use this to run locally (for testing purposes)
#process.load("DQM.Integration.config.fileinputsource_cfi")
#from DQM.Integration.config.fileinputsource_cfi import options


#----------------------------
Expand All @@ -34,7 +37,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = "BeamPixel"
process.dqmSaver.tag = "BeamPixel"

process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BeamPixel'
process.dqmSaverPB.runNumber = options.runNumber

#----------------------------
# Conditions
Expand All @@ -58,7 +63,7 @@
#----------------------------
# Define Sequences
#----------------------------
process.dqmModules = cms.Sequence(process.dqmEnv + process.dqmSaver)
process.dqmModules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)
process.physTrigger = cms.Sequence(process.hltTriggerTypeFilter)


Expand Down
6 changes: 5 additions & 1 deletion DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@
#----------------------------
# for live online DQM in P5
process.load("DQM.Integration.config.pbsource_cfi")
from DQM.Integration.config.pbsource_cfi import options
process.source.loadFiles = cms.untracked.bool(False)
process.source.streamLabel = cms.untracked.string("streamDQMPLT")
process.source.nextLumiTimeoutMillis = cms.untracked.int32(500)
Expand All @@ -20,6 +21,9 @@
process.dqmEnv.subSystemFolder = 'BRIL'
process.dqmEnv.eventInfoFolder = 'EventInfo'
process.dqmSaver.tag = 'BRIL'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BRIL'
process.dqmSaverPB.runNumber = options.runNumber
#-----------------------------

if process.dqmRunConfig.type.value() == "production":
Expand All @@ -34,6 +38,6 @@
process.BrilClient = DQMEDHarvester("BrilClient")

process.bril_path = cms.Path(process.BrilClient)
process.p = cms.EndPath(process.dqmEnv + process.dqmSaver)
process.p = cms.EndPath(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)

process.schedule = cms.Schedule(process.bril_path, process.p)
12 changes: 9 additions & 3 deletions DQM/Integration/python/clients/castor_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -14,12 +14,15 @@

if unitTest:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
else:
# 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

#================================
# DQM Environment
Expand All @@ -30,6 +33,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = "Castor"
process.dqmSaver.tag = "Castor"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "Castor"
process.dqmSaverPB.runNumber = options.runNumber

process.load("FWCore.MessageLogger.MessageLogger_cfi")

Expand Down Expand Up @@ -116,9 +122,9 @@
# castorreco -> CastorSimpleReconstructor_cfi
# castorMonitor -> CastorMonitorModule_cfi

process.p = cms.Path(process.castorDigis*process.castorreco*process.castorMonitor*process.dqmEnv*process.dqmSaver)
#process.p = cms.Path(process.castorDigis*process.castorMonitor*process.dqmEnv*process.dqmSaver)
#process.p = cms.Path(process.castorMonitor*process.dqmEnv*process.dqmSaver)
process.p = cms.Path(process.castorDigis*process.castorreco*process.castorMonitor*process.dqmEnv*process.dqmSaver*process.dqmSaverPB)
#process.p = cms.Path(process.castorDigis*process.castorMonitor*process.dqmEnv*process.dqmSaver*process.dqmSaverPB)
#process.p = cms.Path(process.castorMonitor*process.dqmEnv*process.dqmSaver*process.dqmSaverPB)


process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
Expand Down
10 changes: 8 additions & 2 deletions DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -40,12 +40,15 @@

if unitTest:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
else:
# 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

#----------------------------
# DQM Environment
Expand All @@ -58,6 +61,9 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = "CSC"
process.dqmSaver.tag = "CSC"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "CSC"
process.dqmSaverPB.runNumber = options.runNumber


#process.DQM.collectorHost = 'pccmsdqm02.cern.ch'
Expand Down Expand Up @@ -166,8 +172,8 @@
# Sequences
#--------------------------

#process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver)
process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver)
#process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver+process.dqmSaverPB)
process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver + process.dqmSaverPB)


process.castorDigis.InputLabel = cms.InputTag("rawDataCollector")
Expand Down
10 changes: 9 additions & 1 deletion DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -13,12 +13,15 @@
# event source
if unitTest:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
elif not test:
# for live online DQM in P5
process.load("DQM.Integration.config.inputsource_cfi")
from DQM.Integration.config.inputsource_cfi import options
else:
# for testing in lxplus
process.load("DQM.Integration.config.fileinputsource_cfi")
from DQM.Integration.config.fileinputsource_cfi import options
process.source.fileNames = cms.untracked.vstring(
#"root://eoscms.cern.ch//eos/cms/store/group/phys_pps/sw_test_input/001D08EE-C4B1-E711-B92D-02163E013864.root"
#"/store/express/Run2016H/ExpressPhysics/FEVT/Express-v2/000/283/877/00000/4EE44B0E-2499-E611-A155-02163E011938.root"
Expand All @@ -33,9 +36,13 @@
process.load("DQM.Integration.config.environment_cfi")
process.dqmEnv.subSystemFolder = 'CTPPS'
process.dqmSaver.tag = 'CTPPS'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'CTPPS'
process.dqmSaverPB.runNumber = options.runNumber

if test:
process.dqmSaver.path = "."
process.dqmSaverPB.path = "./pb"

process.load("DQMServices.Components.DQMProvInfo_cfi")

Expand Down Expand Up @@ -87,7 +94,8 @@
#process.dqmModulesCalibration *

process.dqmEnv *
process.dqmSaver
process.dqmSaver *
process.dqmSaverPB
)

process.schedule = cms.Schedule(process.path)
Expand Down
9 changes: 8 additions & 1 deletion DQM/Integration/python/clients/dt4ml_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -14,12 +14,15 @@
#----------------------------
if unitTest:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
else:
# 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

#----------------------------
#### DQM Environment
Expand All @@ -31,6 +34,9 @@
#----------------------------
process.dqmEnv.subSystemFolder = 'DT'
process.dqmSaver.tag = "DT"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "DT"
process.dqmSaverPB.runNumber = options.runNumber
#-----------------------------

### CUSTOMIZE FOR ML
Expand All @@ -48,6 +54,7 @@
process.dqmSaver.keepBackupLumi = True

process.dqmSaver.path = filePath
process.dqmSaverPB.path = filePath + "/pb"

# disable DQM gui
print("old:",process.DQM.collectorHost)
Expand All @@ -71,7 +78,7 @@
cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING'))
)

process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver)
process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)

process.dtDQMPathPhys = cms.Path(process.unpackers + process.dqmmodules + process.physicsEventsFilter * process.dtDQMPhysSequence)

Expand Down
8 changes: 7 additions & 1 deletion DQM/Integration/python/clients/dt_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -13,12 +13,15 @@
#----------------------------
if unitTest:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
else:
# 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

#----------------------------
#### DQM Environment
Expand All @@ -30,6 +33,9 @@
#----------------------------
process.dqmEnv.subSystemFolder = 'DT'
process.dqmSaver.tag = "DT"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "DT"
process.dqmSaverPB.runNumber = options.runNumber
#-----------------------------

#Enable HLT*Mu* filtering to monitor on Muon events
Expand All @@ -53,7 +59,7 @@
cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING'))
)

process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver)
process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB)

process.dtDQMPathPhys = cms.Path(process.unpackers + process.dqmmodules + process.physicsEventsFilter * process.dtDQMPhysSequence)

Expand Down
8 changes: 7 additions & 1 deletion DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -13,8 +13,11 @@

if unitTest:
process.load("DQM.Integration.config.unittestinputsource_cfi")
from DQM.Integration.config.unittestinputsource_cfi import options
else:
process.load("DQM.Integration.config.inputsource_cfi")
from DQM.Integration.config.inputsource_cfi import options

process.load("DQM.Integration.config.environment_cfi")
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down Expand Up @@ -107,6 +110,9 @@

process.dqmEnv.subSystemFolder = cms.untracked.string('Ecal')
process.dqmSaver.tag = cms.untracked.string('Ecal')
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = cms.untracked.string('Ecal')
process.dqmSaverPB.runNumber = options.runNumber

process.simEcalTriggerPrimitiveDigis.InstanceEB = "ebDigis"
process.simEcalTriggerPrimitiveDigis.InstanceEE = "eeDigis"
Expand Down Expand Up @@ -137,7 +143,7 @@
process.ecalClientPath = cms.Path(process.preScaler+process.ecalPreRecoSequence+process.ecalPhysicsFilter+process.ecalMonitorClient)

process.dqmEndPath = cms.EndPath(process.dqmEnv)
process.dqmOutputPath = cms.EndPath(process.dqmSaver)
process.dqmOutputPath = cms.EndPath(process.dqmSaver + process.dqmSaverPB)

### Schedule ###

Expand Down
6 changes: 5 additions & 1 deletion DQM/Integration/python/clients/ecalcalib_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
process.load("FWCore.Modules.preScaler_cfi")
process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
process.load("DQM.Integration.config.inputsource_cfi")
from DQM.Integration.config.inputsource_cfi import options

### Individual module setups ###

Expand Down Expand Up @@ -187,6 +188,9 @@

process.dqmEnv.subSystemFolder = cms.untracked.string('EcalCalibration')
process.dqmSaver.tag = cms.untracked.string('EcalCalibration')
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = cms.untracked.string('EcalCalibration')
process.dqmSaverPB.runNumber = options.runNumber

### Sequences ###

Expand All @@ -201,7 +205,7 @@
process.ecalClientPath = cms.Path(process.ecalCalibMonitorClient)

process.dqmEndPath = cms.EndPath(process.dqmEnv)
process.dqmOutputPath = cms.EndPath(process.dqmSaver)
process.dqmOutputPath = cms.EndPath(process.dqmSaver + process.dqmSaverPB)

### Schedule ###

Expand Down