From 2bf1e368c89619680fa9567c8eae03026b699624 Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Sun, 6 Dec 2020 15:49:16 +0100 Subject: [PATCH 1/8] improve BeamSpot logging --- DQM/BeamMonitor/plugins/BeamMonitor.cc | 6 +++--- DQM/BeamMonitor/plugins/FakeBeamMonitor.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.cc b/DQM/BeamMonitor/plugins/BeamMonitor.cc index 9f85fab6aa5f4..4da01bfac1410 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/BeamMonitor.cc @@ -519,7 +519,7 @@ void BeamMonitor::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const Eve DBloggerReturn_ = 0; if (onlineDbService_.isAvailable()) { onlineDbService_->logger().start(); - onlineDbService_->logger().logInfo() << "BeamMonitor::beginLuminosityBlock"; + onlineDbService_->logger().logInfo() << "BeamMonitor::beginLuminosityBlock - LS: " << lumiSeg.luminosityBlock(); } int nthlumi = lumiSeg.luminosityBlock(); @@ -1394,6 +1394,8 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& << " [epoch in microseconds]"; try { onlineDbService_->writeForNextLumisection(BSOnline, recordName_); + onlineDbService_->logger().logInfo() + << "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly"; } catch (const std::exception& e) { onlineDbService_->logger().logError() << "BeamMonitor - Error writing record: " << recordName_ << " for Run: " << frun << " - Lumi: " << fitLS.second; @@ -1402,8 +1404,6 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& onlineDbService_->logger().logError() << "\n" << bs; DBloggerReturn_ = -1; } - onlineDbService_->logger().logInfo() - << "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly"; } edm::LogInfo("BeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl; diff --git a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc index ef40289c19feb..9be8745ec967b 100644 --- a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc @@ -513,7 +513,7 @@ void FakeBeamMonitor::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const DBloggerReturn_ = 0; if (onlineDbService_.isAvailable()) { onlineDbService_->logger().start(); - onlineDbService_->logger().logInfo() << "FakeBeamMonitor::beginLuminosityBlock"; + onlineDbService_->logger().logInfo() << "FakeBeamMonitor::beginLuminosityBlock - LS: " << lumiSeg.luminosityBlock(); } int nthlumi = lumiSeg.luminosityBlock(); @@ -1416,6 +1416,8 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, << creationTime << " [epoch in microseconds]"; try { onlineDbService_->writeForNextLumisection(BSOnline, recordName_); + onlineDbService_->logger().logInfo() + << "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly"; } catch (const std::exception& e) { onlineDbService_->logger().logError() << "FakeBeamMonitor - Error writing record: " << recordName_ << " for Run: " << frun << " - Lumi: " << fitLS.second; @@ -1424,8 +1426,6 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, onlineDbService_->logger().logError() << "\n" << bs; DBloggerReturn_ = -1; } - onlineDbService_->logger().logInfo() - << "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly"; } edm::LogInfo("FakeBeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl; From 9e81d23b07a66bca8d80b731177fd83afae2a780 Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Mon, 7 Dec 2020 11:26:03 +0100 Subject: [PATCH 2/8] fix BeamSpot logging exit codes --- DQM/BeamMonitor/plugins/BeamMonitor.cc | 4 +++- DQM/BeamMonitor/plugins/FakeBeamMonitor.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.cc b/DQM/BeamMonitor/plugins/BeamMonitor.cc index 4da01bfac1410..38a5105eb0fb2 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/BeamMonitor.cc @@ -1402,7 +1402,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& onlineDbService_->logger().logError() << "Error is: " << e.what(); onlineDbService_->logger().logError() << "RESULTS OF DEFAULT FIT WAS:"; onlineDbService_->logger().logError() << "\n" << bs; - DBloggerReturn_ = -1; + DBloggerReturn_ = 2; } } edm::LogInfo("BeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl; @@ -1418,6 +1418,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& onlineDbService_->logger().logInfo() << "BeamMonitor::FitAndFill - Beam fit fails!!!"; onlineDbService_->logger().logInfo() << "BeamMonitor::FitAndFill - Output beam spot for DIP"; onlineDbService_->logger().logInfo() << "\n" << bs; + DBloggerReturn_ = 2; } hs[k_sigmaX0_lumi]->ShiftFillLast(bs.BeamWidthX(), bs.BeamWidthXError(), fitNLumi_); @@ -1444,6 +1445,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& onlineDbService_->logger().logInfo() << "BeamMonitor::FitAndFill - No fitting"; onlineDbService_->logger().logInfo() << "BeamMonitor::FitAndFill - Output fake beam spot for DIP"; onlineDbService_->logger().logInfo() << "\n" << bs; + DBloggerReturn_ = 2; } hs[k_sigmaX0_lumi]->ShiftFillLast(bs.BeamWidthX(), bs.BeamWidthXError(), fitNLumi_); diff --git a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc index 9be8745ec967b..0600349e5c4c8 100644 --- a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc @@ -1424,7 +1424,7 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, onlineDbService_->logger().logError() << "Error is: " << e.what(); onlineDbService_->logger().logError() << "RESULTS OF DEFAULT FIT WAS:"; onlineDbService_->logger().logError() << "\n" << bs; - DBloggerReturn_ = -1; + DBloggerReturn_ = 2; } } edm::LogInfo("FakeBeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl; From cfae2f541d00f400ad6109b397cb1712a422f05f Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Mon, 7 Dec 2020 11:28:29 +0100 Subject: [PATCH 3/8] fix BeamSpot online tag and jobName for playback running --- .../clients/beam_dqm_sourceclient-live_cfg.py | 11 +++++++++-- .../clients/beamfake_dqm_sourceclient-live_cfg.py | 13 ++++++++++--- .../clients/beamhlt_dqm_sourceclient-live_cfg.py | 11 +++++++++-- .../beamhltfake_dqm_sourceclient-live_cfg.py | 13 ++++++++++--- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index 4f6ad7bd592ba..77949a50f15d0 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -4,6 +4,8 @@ # Define here the BeamSpotOnline record name, # it will be used both in BeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd' +BSOnlineTag = 'BeamSpotOnlineTestLegacy' +BSOnlineJobName = 'BeamSpotOnlineLegacyTest' #from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 #process = cms.Process("BeamMonitor", Run2_2018) FIXME @@ -11,6 +13,11 @@ from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA process = cms.Process("BeamMonitor", Run2_2018_pp_on_AA) +# Configure tag and jobName if running Playback system +if "dqm_cmssw/playback" in str(sys.argv[1]): + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + # process.MessageLogger = cms.Service("MessageLogger", debugModules = cms.untracked.vstring('*'), @@ -369,10 +376,10 @@ latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), saveLogsOnDB = cms.untracked.bool(True), - jobName = cms.untracked.string("BeamSpotOnlineLegacyTest"), # name of the DB log record + jobName = cms.untracked.string(BSOnlineJobName), # name of the DB log record toPut = cms.VPSet(cms.PSet( record = cms.string(BSOnlineRecordName), - tag = cms.string('BSOnlineLegacy_tag'), + tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py index 5291832c36310..8344aa9c7efda 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -5,11 +5,18 @@ # Define here the BeamSpotOnline record name, # it will be used both in FakeBeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd' +BSOnlineTag = 'BeamSpotOnlineTestLegacy' +BSOnlineJobName = 'BeamSpotOnlineLegacyTest' import sys from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 process = cms.Process("FakeBeamMonitor", Run2_2018) +# Configure tag and jobName if running Playback system +if "dqm_cmssw/playback" in str(sys.argv[1]): + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + # process.MessageLogger = cms.Service("MessageLogger", debugModules = cms.untracked.vstring('*'), @@ -147,10 +154,10 @@ latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), saveLogsOnDB = cms.untracked.bool(True), - jobName = cms.untracked.string("BeamSpotOnlineLegacyTest"), # name of the DB log record + jobName = cms.untracked.string(BSOnlineJobName), # name of the DB log record toPut = cms.VPSet(cms.PSet( record = cms.string(BSOnlineRecordName), - tag = cms.string('BeamSpotOnlineTestLegacy'), + tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) @@ -174,7 +181,7 @@ autoCommit = cms.untracked.bool(True), toPut = cms.VPSet(cms.PSet( record = cms.string(BSOnlineRecordName), - tag = cms.string('BeamSpotOnlineTestLegacy'), + tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index 99bc6fa431066..514b96452297a 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -4,6 +4,8 @@ # Define once the BeamSpotOnline record name, # will be used both in BeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineHLTObjectsRcd' +BSOnlineTag = 'BeamSpotOnlineTestHLT' +BSOnlineJobName = 'BeamSpotOnlineHLTTest' #from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 #process = cms.Process("BeamMonitor", Run2_2018) # FIMXE @@ -11,6 +13,11 @@ from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA process = cms.Process("BeamMonitor", Run2_2018_pp_on_AA) +# Configure tag and jobName if running Playback system +if "dqm_cmssw/playback" in str(sys.argv[1]): + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + # Message logger #process.load("FWCore.MessageLogger.MessageLogger_cfi") #process.MessageLogger = cms.Service("MessageLogger", @@ -173,10 +180,10 @@ latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), saveLogsOnDB = cms.untracked.bool(True), - jobName = cms.untracked.string("BeamSpotOnlineHLTTest"), # name of the DB log record + jobName = cms.untracked.string(BSOnlineJobName), # name of the DB log record toPut = cms.VPSet(cms.PSet( record = cms.string(BSOnlineRecordName), - tag = cms.string('BSOnlineHLT_tag'), + tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py index b927e8846b1b4..40f3558861626 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -4,11 +4,18 @@ # Define here the BeamSpotOnline record name, # it will be used both in FakeBeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineHLTObjectsRcd' +BSOnlineTag = 'BeamSpotOnlineTestHLT' +BSOnlineJobName = 'BeamSpotOnlineHLTTest' import sys from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 process = cms.Process("FakeBeamMonitor", Run2_2018) +# Configure tag and jobName if running Playback system +if "dqm_cmssw/playback" in str(sys.argv[1]): + BSOnlineTag = BSOnlineTag + 'Playback' + BSOnlineJobName = BSOnlineJobName + 'Playback' + # switch live = True # FIXME unitTest = False @@ -121,10 +128,10 @@ latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), saveLogsOnDB = cms.untracked.bool(True), - jobName = cms.untracked.string("BeamSpotOnlineHLTTest"), # name of the DB log record + jobName = cms.untracked.string(BSOnlineJobName), # name of the DB log record toPut = cms.VPSet(cms.PSet( record = cms.string(BSOnlineRecordName), - tag = cms.string('BeamSpotOnlineTestHLT'), + tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) @@ -149,7 +156,7 @@ autoCommit = cms.untracked.bool(True), toPut = cms.VPSet(cms.PSet( record = cms.string(BSOnlineRecordName), - tag = cms.string('BeamSpotOnlineTestHLT'), + tag = cms.string(BSOnlineTag), timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) From b6fa6c2ec96b7f7ee4d494055ba314fae7801ee9 Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Mon, 7 Dec 2020 12:12:59 +0100 Subject: [PATCH 4/8] use omsServiceUrl in BeamSpot clients --- .../python/clients/beam_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/beamfake_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 3 ++- .../python/clients/beamhltfake_dqm_sourceclient-live_cfg.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index 77949a50f15d0..e5e8dfd329878 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -371,7 +371,8 @@ preLoadConnectionString = cms.untracked.string('frontier://FrontierPrep/CMS_CONDITIONS'), runNumber = cms.untracked.uint64(options.runNumber), - lastLumiFile = cms.untracked.string(''), + #lastLumiFile = cms.untracked.string('last_lumi.txt'), + omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), writeTransactionDelay = cms.untracked.uint32(options.transDelay), latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py index 8344aa9c7efda..4bcae4aa2fc0c 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -149,7 +149,8 @@ runNumber = cms.untracked.uint64(options.runNumber), #lastLumiFile = cms.untracked.string('last_lumi.txt'), - lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), writeTransactionDelay = cms.untracked.uint32(options.transDelay), latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index 514b96452297a..7f3ad5748154f 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -175,7 +175,8 @@ preLoadConnectionString = cms.untracked.string('frontier://FrontierPrep/CMS_CONDITIONS'), runNumber = cms.untracked.uint64(options.runNumber), - lastLumiFile = cms.untracked.string(''), + #lastLumiFile = cms.untracked.string('last_lumi.txt'), + omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), writeTransactionDelay = cms.untracked.uint32(options.transDelay), latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py index 40f3558861626..0e76e2e2affa7 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -123,7 +123,8 @@ preLoadConnectionString = cms.untracked.string('frontier://FrontierProd/CMS_CONDITIONS'), runNumber = cms.untracked.uint64(options.runNumber), #lastLumiFile = cms.untracked.string('last_lumi.txt'), - lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), writeTransactionDelay = cms.untracked.uint32(options.transDelay), latency = cms.untracked.uint32(2), autoCommit = cms.untracked.bool(True), From 3eea87f880640e97f9b362d9c80c742928624dcc Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Mon, 7 Dec 2020 17:24:28 +0100 Subject: [PATCH 5/8] align all BeamSpot clients --- .../clients/beam_dqm_sourceclient-live_cfg.py | 90 +++++++++++-------- .../beamhlt_dqm_sourceclient-live_cfg.py | 57 +++++++----- 2 files changed, 89 insertions(+), 58 deletions(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index e5e8dfd329878..eb43a4d30ef23 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -35,12 +35,6 @@ live=False unitTest=True -# Switch to veto the upload of the BeamSpot conditions to the DB -# when False it performs the upload -noDB = True -if 'noDB=False' in sys.argv: - noDB=False - #--------------- # Input sources if unitTest: @@ -359,38 +353,58 @@ #--------- # Upload BeamSpotOnlineObject (LegacyRcd) to CondDB -process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", - - DBParameters = cms.PSet( - messageLevel = cms.untracked.int32(0), - authenticationPath = cms.untracked.string('.') - ), - - # Upload to CondDB - connect = cms.string('oracle://cms_orcoff_prep/CMS_CONDITIONS'), - preLoadConnectionString = cms.untracked.string('frontier://FrontierPrep/CMS_CONDITIONS'), - - runNumber = cms.untracked.uint64(options.runNumber), - #lastLumiFile = cms.untracked.string('last_lumi.txt'), - omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), - writeTransactionDelay = cms.untracked.uint32(options.transDelay), - latency = cms.untracked.uint32(2), - autoCommit = cms.untracked.bool(True), - saveLogsOnDB = cms.untracked.bool(True), - jobName = cms.untracked.string(BSOnlineJobName), # name of the DB log record - toPut = cms.VPSet(cms.PSet( - record = cms.string(BSOnlineRecordName), - tag = cms.string(BSOnlineTag), - timetype = cms.untracked.string('Lumi'), - onlyAppendUpdatePolicy = cms.untracked.bool(True) - )) -) - -# If not live or noDB: produce a (local) SQLITE file -if not live or noDB: - process.OnlineDBOutputService.connect = cms.string('sqlite_file:BeamSpotOnlineLegacy.db') - process.OnlineDBOutputService.preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineLegacy.db') - process.OnlineDBOutputService.saveLogsOnDB = cms.untracked.bool(False) +if unitTest == False: + process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", + + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0), + authenticationPath = cms.untracked.string('.') + ), + + # Upload to CondDB + connect = cms.string('oracle://cms_orcon_prod/CMS_CONDITIONS'), + preLoadConnectionString = cms.untracked.string('frontier://FrontierProd/CMS_CONDITIONS'), + + runNumber = cms.untracked.uint64(options.runNumber), + #lastLumiFile = cms.untracked.string('last_lumi.txt'), + #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), + writeTransactionDelay = cms.untracked.uint32(options.transDelay), + latency = cms.untracked.uint32(2), + autoCommit = cms.untracked.bool(True), + saveLogsOnDB = cms.untracked.bool(True), + jobName = cms.untracked.string(BSOnlineJobName), # name of the DB log record + toPut = cms.VPSet(cms.PSet( + record = cms.string(BSOnlineRecordName), + tag = cms.string(BSOnlineTag), + timetype = cms.untracked.string('Lumi'), + onlyAppendUpdatePolicy = cms.untracked.bool(True) + )) + ) +else: + process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", + + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0), + authenticationPath = cms.untracked.string('.') + ), + + # Upload to CondDB + connect = cms.string('sqlite_file:BeamSpotOnlineLegacy.db'), + preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineLegacy.db'), + runNumber = cms.untracked.uint64(options.runNumber), + lastLumiFile = cms.untracked.string('last_lumi.txt'), + #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + writeTransactionDelay = cms.untracked.uint32(options.transDelay), + latency = cms.untracked.uint32(2), + autoCommit = cms.untracked.bool(True), + toPut = cms.VPSet(cms.PSet( + record = cms.string(BSOnlineRecordName), + tag = cms.string(BSOnlineTag), + timetype = cms.untracked.string('Lumi'), + onlyAppendUpdatePolicy = cms.untracked.bool(True) + )) + ) #--------- # Final path diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index 7f3ad5748154f..8915b78f490d6 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -32,28 +32,28 @@ # destinations = cms.untracked.vstring('cerr'), #) -unitTest=False +# switch +live = True # FIXME +unitTest = False + if 'unitTest=True' in sys.argv: + live=False unitTest=True -# Switch to veto the upload of the BeamSpot conditions to the DB -# when False it performs the upload -noDB = True -if 'noDB=False' in sys.argv: - noDB=False - # Common part for PP and H.I Running #----------------------------- if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") from DQM.Integration.config.unittestinputsource_cfi import options -else: +elif live: # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") from DQM.Integration.config.inputsource_cfi import options - # new stream label process.source.streamLabel = cms.untracked.string('streamDQMOnlineBeamspot') +else: + process.load("DQM.Integration.config.fileinputsource_cfi") + from DQM.Integration.config.fileinputsource_cfi import options # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") @@ -163,19 +163,19 @@ #--------- # Upload BeamSpotOnlineObject (HLTRcd) to CondDB - process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", - + if unitTest == False: + process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", DBParameters = cms.PSet( messageLevel = cms.untracked.int32(0), authenticationPath = cms.untracked.string('.') ), # Upload to CondDB - connect = cms.string('oracle://cms_orcoff_prep/CMS_CONDITIONS'), - preLoadConnectionString = cms.untracked.string('frontier://FrontierPrep/CMS_CONDITIONS'), - + connect = cms.string('oracle://cms_orcon_prod/CMS_CONDITIONS'), + preLoadConnectionString = cms.untracked.string('frontier://FrontierProd/CMS_CONDITIONS'), runNumber = cms.untracked.uint64(options.runNumber), #lastLumiFile = cms.untracked.string('last_lumi.txt'), + #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), omsServiceUrl = cms.untracked.string('http://cmsoms-services.cms:9949/urn:xdaq-application:lid=100/getRunAndLumiSection'), writeTransactionDelay = cms.untracked.uint32(options.transDelay), latency = cms.untracked.uint32(2), @@ -188,13 +188,30 @@ timetype = cms.untracked.string('Lumi'), onlyAppendUpdatePolicy = cms.untracked.bool(True) )) - ) + ) + else: + process.OnlineDBOutputService = cms.Service("OnlineDBOutputService", + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0), + authenticationPath = cms.untracked.string('.') + ), - # If not live or noDB: produce a (local) SQLITE file - if unitTest or noDB: - process.OnlineDBOutputService.connect = cms.string('sqlite_file:BeamSpotOnlineHLT.db') - process.OnlineDBOutputService.preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineHLT.db') - process.OnlineDBOutputService.saveLogsOnDB = cms.untracked.bool(False) + # Upload to CondDB + connect = cms.string('sqlite_file:BeamSpotOnlineHLT.db'), + preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineHLT.db'), + runNumber = cms.untracked.uint64(options.runNumber), + lastLumiFile = cms.untracked.string('last_lumi.txt'), + #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'), + writeTransactionDelay = cms.untracked.uint32(options.transDelay), + latency = cms.untracked.uint32(2), + autoCommit = cms.untracked.bool(True), + toPut = cms.VPSet(cms.PSet( + record = cms.string(BSOnlineRecordName), + tag = cms.string(BSOnlineTag), + timetype = cms.untracked.string('Lumi'), + onlyAppendUpdatePolicy = cms.untracked.bool(True) + )) + ) process.p = cms.Path( process.hltTriggerTypeFilter * process.dqmcommon From 22b6ffca6c990707e74c5cf6b288d413a1b6bf39 Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Mon, 7 Dec 2020 19:41:22 +0100 Subject: [PATCH 6/8] update GT options in BeamSpot clients --- .../python/clients/beam_dqm_sourceclient-live_cfg.py | 1 + .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index eb43a4d30ef23..be4289e81c866 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -73,6 +73,7 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '') + process.GlobalTag.DBParameters.authenticationPath = cms.untracked.string('.') # you may need to set manually the GT in the line below #process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10' diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index 8915b78f490d6..baedd62bf4b2a 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -86,7 +86,7 @@ # Calibration #--------------- # Condition for P5 cluster -#process.load("DQM.Integration.config.FrontierCondition_GT_cfi") +process.load("DQM.Integration.config.FrontierCondition_GT_cfi") # Condition for lxplus: change and possibly customise the GT #from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise #process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '') From bed86ca7bef864549800a56c6d5c6cc995fdd246 Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Tue, 8 Dec 2020 09:26:02 +0100 Subject: [PATCH 7/8] align tag and jobName in BeamSpot clients --- .../python/clients/beam_dqm_sourceclient-live_cfg.py | 2 +- .../python/clients/beamfake_dqm_sourceclient-live_cfg.py | 2 +- .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 2 +- .../python/clients/beamhltfake_dqm_sourceclient-live_cfg.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index be4289e81c866..3342b9a80b59b 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -5,7 +5,7 @@ # it will be used both in BeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd' BSOnlineTag = 'BeamSpotOnlineTestLegacy' -BSOnlineJobName = 'BeamSpotOnlineLegacyTest' +BSOnlineJobName = 'BeamSpotOnlineTestLegacy' #from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 #process = cms.Process("BeamMonitor", Run2_2018) FIXME diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py index 4bcae4aa2fc0c..d9cb03527386b 100644 --- a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py @@ -6,7 +6,7 @@ # it will be used both in FakeBeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd' BSOnlineTag = 'BeamSpotOnlineTestLegacy' -BSOnlineJobName = 'BeamSpotOnlineLegacyTest' +BSOnlineJobName = 'BeamSpotOnlineTestLegacy' import sys from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index baedd62bf4b2a..d1d58876b54be 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -5,7 +5,7 @@ # will be used both in BeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineHLTObjectsRcd' BSOnlineTag = 'BeamSpotOnlineTestHLT' -BSOnlineJobName = 'BeamSpotOnlineHLTTest' +BSOnlineJobName = 'BeamSpotOnlineTestHLT' #from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 #process = cms.Process("BeamMonitor", Run2_2018) # FIMXE diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py index 0e76e2e2affa7..3c0b1b34672cd 100644 --- a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py @@ -5,7 +5,7 @@ # it will be used both in FakeBeamMonitor setup and in payload creation/upload BSOnlineRecordName = 'BeamSpotOnlineHLTObjectsRcd' BSOnlineTag = 'BeamSpotOnlineTestHLT' -BSOnlineJobName = 'BeamSpotOnlineHLTTest' +BSOnlineJobName = 'BeamSpotOnlineTestHLT' import sys from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 From 9c0104e6aa8a7f4fc653c2f855d9a8c4ccddaeeb Mon Sep 17 00:00:00 2001 From: francescobrivio Date: Tue, 15 Dec 2020 00:08:51 +0100 Subject: [PATCH 8/8] fix authenticationPath in BeamSpot clients --- DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py | 1 + .../python/clients/beamhlt_dqm_sourceclient-live_cfg.py | 1 + 2 files changed, 2 insertions(+) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index 3342b9a80b59b..e0d5d05bc193a 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -69,6 +69,7 @@ # Conditions if (live): process.load("DQM.Integration.config.FrontierCondition_GT_cfi") + process.GlobalTag.DBParameters.authenticationPath = cms.untracked.string('.') else: process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py index d1d58876b54be..2b7eb6965f27a 100644 --- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py @@ -87,6 +87,7 @@ #--------------- # Condition for P5 cluster process.load("DQM.Integration.config.FrontierCondition_GT_cfi") +process.GlobalTag.DBParameters.authenticationPath = cms.untracked.string('.') # Condition for lxplus: change and possibly customise the GT #from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise #process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')