From c3a93bcffee1f2151117a7ac99fcbc629212afd5 Mon Sep 17 00:00:00 2001 From: Carl Vuosalo Date: Fri, 16 Jul 2021 22:13:21 +0200 Subject: [PATCH] Enable DD4hep DB wf with correct GT --- Configuration/PyReleaseValidation/python/relval_2017.py | 2 +- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index ef378f7bf7c72..440b8d120f04a 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -55,7 +55,7 @@ 10824.511, 10824.521, 11634.911, 11650.911, - # 11634.912, # Wait until CondDB issues resolved + 11634.912, 11601.0,11602.0,11603.0,11604.0,11605.0,11606.0,11607.0,11608.0,11609.0,11630.0,11643.0, 11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12034.0,11725.0,11925.0, 11634.1,11634.5,11634.7,11634.91, diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 5ff0d5d0738a3..b2ffc7a0c4577 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -1015,7 +1015,7 @@ def condition(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflow_DD4hepDB(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if 'Run3' in stepDict[step][k]['--era']: - stepDict[stepName][k] = merge([{'--conditions': 'specialDD4hepTEST_120X_mcRun3_2021_realistic_v1_Candidate_2021_07_07_12_35_50', '--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) + stepDict[stepName][k] = merge([{'--conditions': '120X_mcRun3_2021_realistic_dd4hep_v1', '--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return '2021' in key upgradeWFs['DD4hepDB'] = UpgradeWorkflow_DD4hepDB( diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index a9fa63047fcca..14be70b97b34a 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -88,7 +88,7 @@ def runSelected(opt): 10224.0, #2017 ttbar PU 10824.0, #2018 ttbar 11634.911, #2021 DD4hep ttbar reading geometry from XML - # 11634.912, #2021 DD4hep ttbar reading geometry from the DB, wait for CondDB fix + 11634.912, #2021 DD4hep ttbar reading geometry from the DB 11634.0, #2021 ttbar 12434.0, #2023 ttbar 23234.0, #2026D49 ttbar (HLT TDR baseline w/ HGCal v11)