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.

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

[14_1_X] refactor: disable DQM pb files production #46724

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
process.dqmEnv.subSystemFolder = 'BeamMonitorLegacy'
process.dqmSaver.tag = 'BeamMonitorLegacy'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BeamMonitorLegacy'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'BeamMonitorLegacy'
# process.dqmSaverPB.runNumber = options.runNumber

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

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

#
process.monitor = cms.Sequence(process.dqmBeamMonitor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
process.dqmEnv.subSystemFolder = 'FakeBeamMonitorLegacy'
process.dqmSaver.tag = 'FakeBeamMonitorLegacy'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'FakeBeamMonitorLegacy'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'FakeBeamMonitorLegacy'
# process.dqmSaverPB.runNumber = options.runNumber

# Configure tag and jobName if running Playback system
if process.isDqmPlayback.value :
Expand Down Expand Up @@ -100,7 +100,7 @@
#-----------------

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

#
process.monitor = cms.Sequence(process.dqmFakeBeamMonitor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
process.dqmEnv.subSystemFolder = 'BeamMonitorHLT'
process.dqmSaver.tag = 'BeamMonitorHLT'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BeamMonitorHLT'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'BeamMonitorHLT'
# process.dqmSaverPB.runNumber = options.runNumber

# Configure tag and jobName if running Playback system
if process.isDqmPlayback.value :
Expand Down Expand Up @@ -124,7 +124,7 @@
process.dqmBeamMonitor.BeamFitter.DIPFileName = '/nfshome0/dqmdev/BeamMonitorDQM/BeamFitResults.txt'

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
process.dqmEnv.subSystemFolder = 'FakeBeamMonitorHLT'
process.dqmSaver.tag = 'FakeBeamMonitorHLT'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'FakeBeamMonitorHLT'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'FakeBeamMonitorHLT'
# process.dqmSaverPB.runNumber = options.runNumber

# Configure tag and jobName if running Playback system
if process.isDqmPlayback.value :
Expand Down Expand Up @@ -94,7 +94,7 @@
# Condition for P5 cluster
#process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
process.dqmcommon = cms.Sequence(process.dqmEnv
* process.dqmSaver * process.dqmSaverPB)
* process.dqmSaver )#* process.dqmSaverPB)

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
process.dqmEnv.subSystemFolder = "BeamPixel"
process.dqmSaver.tag = "BeamPixel"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BeamPixel'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'BeamPixel'
# process.dqmSaverPB.runNumber = options.runNumber

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


Expand Down
6 changes: 3 additions & 3 deletions DQM/Integration/python/clients/bril_dqm_clientPB-live_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
process.dqmEnv.eventInfoFolder = 'EventInfo'
process.dqmSaver.tag = 'BRIL'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'BRIL'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'BRIL'
# process.dqmSaverPB.runNumber = options.runNumber
#-----------------------------

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

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

process.schedule = cms.Schedule(process.bril_path, process.p)
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
process.dqmEnv.subSystemFolder = "Castor"
process.dqmSaver.tag = "Castor"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "Castor"
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = "Castor"
# process.dqmSaverPB.runNumber = options.runNumber

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

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

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.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 = "rawDataCollector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
process.dqmEnv.subSystemFolder = "CSC"
process.dqmSaver.tag = "CSC"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "CSC"
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = "CSC"
# process.dqmSaverPB.runNumber = options.runNumber


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

#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.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 = "rawDataCollector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
process.dqmEnv.subSystemFolder = 'CTPPS'
process.dqmSaver.tag = 'CTPPS'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'CTPPS'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'CTPPS'
# process.dqmSaverPB.runNumber = options.runNumber

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

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

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

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

process.schedule = cms.Schedule(process.path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
process.dqmEnv.subSystemFolder = 'DT'
process.dqmSaver.tag = "DT"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "DT"
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = "DT"
# process.dqmSaverPB.runNumber = options.runNumber
#-----------------------------

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

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

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

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
process.dqmEnv.subSystemFolder = 'DT'
process.dqmSaver.tag = "DT"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "DT"
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = "DT"
# process.dqmSaverPB.runNumber = options.runNumber
#-----------------------------

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

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
process.dqmEnv.subSystemFolder = 'Ecal'
process.dqmSaver.tag = 'Ecal'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'Ecal'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'Ecal'
# process.dqmSaverPB.runNumber = options.runNumber

process.simEcalTriggerPrimitiveDigis.InstanceEB = "ebDigis"
process.simEcalTriggerPrimitiveDigis.InstanceEE = "eeDigis"
Expand Down Expand Up @@ -174,7 +174,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.dqmSaverPB)
process.dqmOutputPath = cms.EndPath(process.dqmSaver )#+ process.dqmSaverPB)

### Schedule ###

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@
process.dqmEnv.subSystemFolder = 'EcalCalibration'
process.dqmSaver.tag = 'EcalCalibration'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'EcalCalibration'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'EcalCalibration'
# process.dqmSaverPB.runNumber = options.runNumber

### Sequences ###

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

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

### Schedule ###

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
process.dqmEnv.subSystemFolder = 'Ecal'
process.dqmSaver.tag = 'EcalGPU'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'EcalGPU'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'EcalGPU'
# process.dqmSaverPB.runNumber = options.runNumber

process.ecalGpuTask.params.runGpuTask = True
process.ecalGpuTask.params.enableRecHit = False
Expand Down Expand Up @@ -95,7 +95,7 @@

process.ecalMonitorPath = cms.Path(process.preScaler+process.ecalMonitorTask)
process.dqmEndPath = cms.EndPath(process.dqmEnv)
process.dqmOutputPath = cms.EndPath(process.dqmSaver + process.dqmSaverPB)
process.dqmOutputPath = cms.EndPath(process.dqmSaver )#+ process.dqmSaverPB)

### Schedule ###

Expand Down
10 changes: 5 additions & 5 deletions DQM/Integration/python/clients/es_dqm_sourceclient-live_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
process.dqmEnv.subSystemFolder = 'EcalPreshower'
process.dqmSaver.tag = 'EcalPreshower'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'EcalPreshower'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'EcalPreshower'
# process.dqmSaverPB.runNumber = options.runNumber
# for local test
#process.dqmSaver.path = '.'
#process.dqmSaverPB.path = './pb'
## process.dqmSaverPB.path = './pb'

process.load("DQM/EcalPreshowerMonitorModule/EcalPreshowerMonitorTasks_cfi")
process.ecalPreshowerIntegrityTask.ESDCCCollections = "esRawToDigi"
Expand All @@ -78,8 +78,8 @@
process.ecalPreshowerDefaultTasksSequence*
process.dqmEnv*
process.ecalPreshowerMonitorClient*
process.dqmSaver*
process.dqmSaverPB)
process.dqmSaver)#*
#process.dqmSaverPB)


process.esRawToDigi.sourceTag = "rawDataCollector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
process.dqmEnv.subSystemFolder = 'FED'
process.dqmSaver.tag = 'FED'
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = 'FED'
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = 'FED'
# process.dqmSaverPB.runNumber = options.runNumber

# Subsystem sequences

Expand Down Expand Up @@ -153,7 +153,7 @@
process.DQMmodulesPath = cms.Path(
process.dqmEnv
+ process.dqmSaver
+ process.dqmSaverPB
#+ process.dqmSaverPB
)

process.schedule = cms.Schedule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
process.dqmEnv.subSystemFolder = "GEM"
process.dqmSaver.tag = "GEM"
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = "GEM"
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = "GEM"
# process.dqmSaverPB.runNumber = options.runNumber

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

Expand Down Expand Up @@ -71,8 +71,8 @@

process.end_path = cms.EndPath(
process.dqmEnv +
process.dqmSaver +
process.dqmSaverPB
process.dqmSaver #+
# process.dqmSaverPB
)

process.schedule = cms.Schedule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
process.dqmEnv.subSystemFolder = subsystem
process.dqmSaver.tag = subsystem
process.dqmSaver.runNumber = options.runNumber
process.dqmSaverPB.tag = subsystem
process.dqmSaverPB.runNumber = options.runNumber
# process.dqmSaverPB.tag = subsystem
# process.dqmSaverPB.runNumber = options.runNumber
process = customise(process)
process.DQMStore.verbose = 0

Expand Down Expand Up @@ -229,7 +229,7 @@
process.dqmEnv)
process.dqmPath1 = cms.EndPath(
process.dqmSaver
*process.dqmSaverPB
#*process.dqmSaverPB
)
process.qtPath = cms.Path(process.hcalQualityTests)

Expand Down
Loading