Merge pull request #30592 from andrius-k/dqm-online-live-mode-protobu…

…f-saver

Added new DQM GUI support to all Online DQM clients

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

@@ -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'
@@ -228,7 +231,7 @@
 
 #
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver)
+                               * process.dqmSaver*process.dqmSaverPB)
 
 #
 process.monitor = cms.Sequence(process.dqmBeamMonitor

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

@@ -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'
@@ -229,7 +232,7 @@
 
 #
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver)
+                               * process.dqmSaver*process.dqmSaverPB)
 
 #
 process.monitor = cms.Sequence(process.dqmFakeBeamMonitor

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

@@ -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
@@ -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)
 

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

@@ -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
@@ -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)
 

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

@@ -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
 
 
 #----------------------------
@@ -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
@@ -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)
 
 

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

@@ -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)
@@ -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":
@@ -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)

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

@@ -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
@@ -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")
 
@@ -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")

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

@@ -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
@@ -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'
@@ -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")

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

@@ -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"
@@ -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")
 
@@ -87,7 +94,8 @@
   #process.dqmModulesCalibration *
 
   process.dqmEnv *
-  process.dqmSaver
+  process.dqmSaver *
+  process.dqmSaverPB
 )
 
 process.schedule = cms.Schedule(process.path)

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

@@ -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
@@ -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
@@ -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)
@@ -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)
 

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

@@ -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
@@ -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
@@ -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)
 

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

@@ -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")
@@ -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"
@@ -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 ###
 

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

@@ -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 ###
 
@@ -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 ###
 
@@ -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 ###