From fefbb67c45a405aa4262eb1bfac9d5dd665a780a Mon Sep 17 00:00:00 2001 From: Cms Build Date: Sun, 12 Jul 2020 23:24:43 +0200 Subject: [PATCH] Synchronise with CMSSW_11_2_0_pre2 --- CalibTracker/SiPixelESProducers/BuildFile.xml | 1 - .../clients/beam_dqm_sourceclient-live_cfg.py | 44 +++++++++++++++++++ .../beampixel_dqm_sourceclient-live_cfg.py | 9 ++-- .../python/globalValidation_cff.py | 10 ++++- 4 files changed, 56 insertions(+), 8 deletions(-) diff --git a/CalibTracker/SiPixelESProducers/BuildFile.xml b/CalibTracker/SiPixelESProducers/BuildFile.xml index fc506b154c5f2..4a43231fa11cb 100644 --- a/CalibTracker/SiPixelESProducers/BuildFile.xml +++ b/CalibTracker/SiPixelESProducers/BuildFile.xml @@ -8,7 +8,6 @@ - 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 d0e5ff6c7d5ce..c19cd7d0ba69c 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -1,6 +1,10 @@ from __future__ import print_function import FWCore.ParameterSet.Config as cms +# Define here the BeamSpotOnline record name, +# it will be used both in BeamMonitor setup and in payload creation/upload +BSOnlineRecordName = 'BeamSpotOnlineLegacyObjectsRcd' + #from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 #process = cms.Process("BeamMonitor", Run2_2018) FIXME import sys @@ -24,14 +28,23 @@ 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: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options elif live: process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options else: process.load("DQM.Integration.config.fileinputsource_cfi") + from DQM.Integration.config.fileinputsource_cfi import options #-------------------------- # HLT Filter @@ -281,6 +294,7 @@ process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") process.dqmBeamMonitor.OnlineMode = True +process.dqmBeamMonitor.recordName = BSOnlineRecordName process.dqmBeamMonitor.resetEveryNLumi = 5 # was 10 for HI process.dqmBeamMonitor.resetPVEveryNLumi = 5 # was 10 for HI @@ -333,6 +347,36 @@ process.dqmBeamMonitor.hltResults = cms.InputTag("TriggerResults","","HLT") +#--------- +# 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(''), + writeTransactionDelay = cms.untracked.uint32(options.transDelay), + autoCommit = cms.untracked.bool(True), + toPut = cms.VPSet(cms.PSet( + record = cms.string(BSOnlineRecordName), + tag = cms.string('BSOnlineLegacy_tag'), + 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') + #--------- # Final path if (not process.runType.getRunType() == process.runType.hi_run): diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index 3fdc7f2d6d2ac..3b6584f309d2a 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -5,19 +5,18 @@ from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 process = cms.Process("BeamPixel", Run2_2018) -unitTest=False +unitTest = False if 'unitTest=True' in sys.argv: - unitTest=True + unitTest = True + #---------------------------- # Common for PP and HI running #---------------------------- - -if unitTest: +if unitTest == True: process.load("DQM.Integration.config.unittestinputsource_cfi") else: process.load("DQM.Integration.config.inputsource_cfi") - # Use this to run locally (for testing purposes) #process.load("DQM.Integration.config.fileinputsource_cfi") diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py index 7ac89acd5bbea..26e3ba73b7c87 100644 --- a/Validation/Configuration/python/globalValidation_cff.py +++ b/Validation/Configuration/python/globalValidation_cff.py @@ -184,8 +184,13 @@ hcalSimHitsValidationSequence + hcaldigisValidationSequence + hcalSimHitStudy - + hcalRecHitsValidationSequence - + calotowersValidationSequence +) + +globalValidationHCALOnly = cms.Sequence( + hcalSimHitsValidationSequence + + hcaldigisValidationSequence + + hcalSimHitStudy + + hcalRecHitsOnlyValidationSequence ) globalValidationHCALOnly = cms.Sequence( @@ -196,6 +201,7 @@ ) globalValidationHGCal = cms.Sequence(hgcalValidation) +globalPrevalidationHGCal = cms.Sequence(hgcalAssociators) globalValidationMTD = cms.Sequence()