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

[12_1_X] Improve DQM beamspot clients #35935

Merged
merged 3 commits into from Nov 3, 2021
Merged

[12_1_X] Improve DQM beamspot clients #35935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b61d16
Improve DQM beamspot clients
francescobrivio Oct 30, 2021
d5206da
fix typo in name of BeamSpotOnline tag for Legacy client
francescobrivio Oct 30, 2021
2a7ef1d
remove ptMin = 0.1 in DQM BeamSpot Legacy client
francescobrivio Nov 1, 2021
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
28 changes: 19 additions & 9 deletions DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
# Define here the BeamSpotOnline record name,
# it will be used both in BeamMonitor setup and in payload creation/upload
BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd'
BSOnlineTag = 'BeamSpotOnlinetLegacy'
BSOnlineTag = 'BeamSpotOnlineLegacy'
BSOnlineJobName = 'BeamSpotOnlineLegacy'
BSOnlineOmsServiceUrl = 'http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'
useLockRecords = True
Expand Down Expand Up @@ -83,6 +83,13 @@
# you may need to set manually the GT in the line below
#process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'

#--------------------------------------------------------
# Swap offline <-> online BeamSpot as in Express and HLT
import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
process.BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone()
import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
process.offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()

#----------------------------
# BeamMonitor
process.load("DQM.BeamMonitor.BeamMonitor_Pixel_cff")
Expand Down Expand Up @@ -166,7 +173,7 @@

import DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi
process.pixelTracksMonitor = DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi.TrackerCollisionTrackMon.clone(
FolderName = 'BeamMonitor/Tracking/pixelTracks',
FolderName = 'BeamMonitorLegacy/Tracking/pixelTracks',
TrackProducer = 'pixelTracks',
allTrackProducer = 'pixelTracks',
beamSpot = "offlineBeamSpot",
Expand Down Expand Up @@ -213,7 +220,7 @@

#
process.selectedPixelTracksMonitor = process.pixelTracksMonitor.clone(
FolderName = 'BeamMonitor/Tracking/selectedPixelTracks',
FolderName = 'BeamMonitorLegacy/Tracking/selectedPixelTracks',
TrackProducer = 'tracks2monitor',
allTrackProducer = 'tracks2monitor'
)
Expand Down Expand Up @@ -248,7 +255,7 @@
# BeamSpotProblemMonitor

#
process.dqmBeamSpotProblemMonitor.monitorName = "BeamMonitor/BeamSpotProblemMonitor"
process.dqmBeamSpotProblemMonitor.monitorName = "BeamMonitorLegacy/BeamSpotProblemMonitor"
process.dqmBeamSpotProblemMonitor.AlarmONThreshold = 15 # was 10
process.dqmBeamSpotProblemMonitor.AlarmOFFThreshold = 17 # was 12
process.dqmBeamSpotProblemMonitor.nCosmicTrk = 10
Expand Down Expand Up @@ -304,6 +311,7 @@
process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")

process.dqmBeamMonitor.OnlineMode = True
process.dqmBeamMonitor.monitorName = "BeamMonitorLegacy"
process.dqmBeamMonitor.recordName = BSOnlineRecordName
process.dqmBeamMonitor.useLockRecords = useLockRecords

Expand All @@ -321,11 +329,13 @@
process.pixelVertices = pixelVertices.clone(
TkFilterParameters = dict( minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin)
)
process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4
process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 12
process.pixelTracksTrackingRegions.RegionPSet.originXPos = 0.08
process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03
process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0.
#process.pixelTracksTrackingRegions.RegionPSet.ptMin = 0.1 # used in PilotBeam 2021, but not ok for standard collisions
process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4 # used in PilotBeam 2021, to be checked again for standard collisions
# The following parameters were used in 2018 HI:
#process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 12
#process.pixelTracksTrackingRegions.RegionPSet.originXPos = 0.08
#process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03
#process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0.

process.tracking_FirstStep = cms.Sequence(
process.siPixelDigis
Expand Down
14 changes: 10 additions & 4 deletions DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Expand Up @@ -120,22 +120,28 @@
from DQM.Integration.config.online_customizations_cfi import *
process = customise(process)

#-----------------------------------------------------------
# Swap offline <-> online BeamSpot as in Express and HLT
import RecoVertex.BeamSpotProducer.onlineBeamSpotESProducer_cfi as _mod
process.BeamSpotESProducer = _mod.onlineBeamSpotESProducer.clone()
import RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi
process.offlineBeamSpot = RecoVertex.BeamSpotProducer.BeamSpotOnline_cfi.onlineBeamSpotProducer.clone()

#--------------------------
# Proton-Proton Stuff
#--------------------------

if (process.runType.getRunType() == process.runType.pp_run or
process.runType.getRunType() == process.runType.pp_run_stage1 or
process.runType.getRunType() == process.runType.cosmic_run or
process.runType.getRunType() == process.runType.cosmic_run_stage1 or
process.runType.getRunType() == process.runType.hpu_run or
process.runType.getRunType() == process.runType.hi_run):
process.runType.getRunType() == process.runType.hi_run or
process.runType.getRunType() == process.runType.commissioning_run):

print("[beamhlt_dqm_sourceclient-live_cfg]:: Running pp")

process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")

process.dqmBeamMonitor.monitorName = 'BeamMonitor'
process.dqmBeamMonitor.monitorName = 'BeamMonitorHLT'

process.dqmBeamMonitor.OnlineMode = True
process.dqmBeamMonitor.recordName = BSOnlineRecordName
Expand Down