From 9eabb19b61d8b25c7fdf89c55a5739002a53a42e Mon Sep 17 00:00:00 2001 From: Davide Zuolo Date: Mon, 1 Nov 2021 18:32:21 +0100 Subject: [PATCH] Changes to OnlineBeamMonitor DQM client and plugin --- DQM/BeamMonitor/plugins/OnlineBeamMonitor.cc | 22 +++++++++++-------- ...nebeammonitor_dqm_sourceclient-live_cfg.py | 21 +++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/DQM/BeamMonitor/plugins/OnlineBeamMonitor.cc b/DQM/BeamMonitor/plugins/OnlineBeamMonitor.cc index 534d639bf858a..0c2773cda89ad 100644 --- a/DQM/BeamMonitor/plugins/OnlineBeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/OnlineBeamMonitor.cc @@ -109,11 +109,15 @@ void OnlineBeamMonitor::bookHistograms(DQMStore::IBooker& ibooker, // create and cd into new folder ibooker.setCurrentFolder(monitorName_ + "Validation"); //Book histograms - bsChoice_ = ibooker.book1D("bsChoice", - "Choice between HLT (+1) and Legacy (-1) BS", - lastLumi - firstLumi + 1, - firstLumi - 0.5, - lastLumi + 0.5); + bsChoice_ = ibooker.bookProfile("bsChoice", + "BS Choice (+1): HLT - (-1): Legacy - (-10): Fake BS - (0): No Transient ", + lastLumi - firstLumi + 1, + firstLumi - 0.5, + lastLumi + 0.5, + 100, + -10, + 1, + ""); bsChoice_->setAxisTitle("Lumisection", 1); bsChoice_->setAxisTitle("Choice", 2); } @@ -236,18 +240,18 @@ void OnlineBeamMonitor::globalEndLuminosityBlock(const LuminosityBlock& iLumi, c if (beamSpotsMap_.find("Transient") != beamSpotsMap_.end()) { if (beamSpotsMap_.find("HLT") != beamSpotsMap_.end() && beamSpotsMap_["Transient"].x0() == beamSpotsMap_["HLT"].x0()) { - bsChoice_->setBinContent(iLumi.id().luminosityBlock(), 1); + bsChoice_->Fill(iLumi.id().luminosityBlock(), 1); bsChoice_->setBinError(iLumi.id().luminosityBlock(), 0.05); } else if (beamSpotsMap_.find("Legacy") != beamSpotsMap_.end() && beamSpotsMap_["Transient"].x0() == beamSpotsMap_["Legacy"].x0()) { - bsChoice_->setBinContent(iLumi.id().luminosityBlock(), -1); + bsChoice_->Fill(iLumi.id().luminosityBlock(), -1); bsChoice_->setBinError(iLumi.id().luminosityBlock(), 0.05); } else { - bsChoice_->setBinContent(iLumi.id().luminosityBlock(), -10); + bsChoice_->Fill(iLumi.id().luminosityBlock(), -10); bsChoice_->setBinError(iLumi.id().luminosityBlock(), 0.05); } } else { - bsChoice_->setBinContent(iLumi.id().luminosityBlock(), 0); + bsChoice_->Fill(iLumi.id().luminosityBlock(), 0); bsChoice_->setBinError(iLumi.id().luminosityBlock(), 0.05); } diff --git a/DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py index 46e579f65fd74..8ded75cfe036a 100644 --- a/DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py @@ -4,11 +4,10 @@ # Define once the BeamSpotOnline record name, # will be used both in BeamMonitor setup and in payload creation/upload -#from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 -#process = cms.Process("BeamMonitor", Run2_2018) # FIMXE import sys -from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 -process = cms.Process("OnlineBeamMonitor", Run2_2018) + +from Configuration.Eras.Era_Run3_cff import Run3 +process = cms.Process("OnlineBeamMonitor", Run3) # Message logger #process.load("FWCore.MessageLogger.MessageLogger_cfi") @@ -42,13 +41,13 @@ ) options.register('runNumber', - 336055, + 346508, VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.int, "Run number. This run number has to be present in the dataset configured with the dataset option.") options.register('dataset', - '/ExpressCosmics/Commissioning2019-Express-v1/FEVT', + '/ExpressPhysics/Commissioning2021-Express-v1/FEVT', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Dataset name like '/ExpressCosmics/Commissioning2019-Express-v1/FEVT'") @@ -102,7 +101,7 @@ process.source = cms.Source("EmptySource") process.source.numberEventsInRun=cms.untracked.uint32(100) process.source.firstRun = cms.untracked.uint32(options.runNumber) - process.source.firstLuminosityBlock = cms.untracked.uint32(49) + process.source.firstLuminosityBlock = cms.untracked.uint32(1) process.source.numberEventsInLuminosityBlock = cms.untracked.uint32(2) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) @@ -123,17 +122,17 @@ # DQM Live Environment #----------------------------- process.load("DQM.Integration.config.environment_cfi") -process.dqmEnv.subSystemFolder = 'TrackingHLTBeamspotStream' -process.dqmSaver.tag = 'TrackingHLTBeamspotStream' +process.dqmEnv.subSystemFolder = 'OnlineBeamMonitor' +process.dqmSaver.tag = 'OnlineBeamMonitor' process.dqmSaver.runNumber = options.runNumber -process.dqmSaverPB.tag = 'TrackingHLTBeamspotStream' +process.dqmSaverPB.tag = 'OnlineBeamMonitor' process.dqmSaverPB.runNumber = options.runNumber #----------------------------- # BeamMonitor #----------------------------- process.dqmOnlineBeamMonitor = cms.EDProducer("OnlineBeamMonitor", -MonitorName = cms.untracked.string("onlineBeamMonitor") +MonitorName = cms.untracked.string("OnlineBeamMonitor") ) #---------------