From 53711db319bca172673ff2996d953e7adb36d11d Mon Sep 17 00:00:00 2001 From: Silvio Date: Wed, 10 Feb 2021 12:37:55 +0100 Subject: [PATCH] remove 11624.911, add 11634.911 in the short matrix, move ZMM DD4HEP to 14TeV --- Configuration/PyReleaseValidation/python/relval_2017.py | 4 ++-- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 00557eb1e13fa..9ee03458966fe 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -28,7 +28,7 @@ # (Patatrack pixel-only: TTbar - on CPU) # (Patatrack ECAL-only: TTbar - on CPU) # (Patatrack HCAL-only: TTbar - on CPU) -# 2021 (DD4HEP: TTbar, TTbar, ZMM) +# 2021 (DD4HEP: TTbar, ZMM) # (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat) # (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design) # (TTbar trackingOnly, pixelTrackingOnly, trackingMkFit) @@ -55,7 +55,7 @@ 10824.501, 10824.511, 10824.521, - 11634.911,11624.911, 11642.911, + 11634.911, 11650.911, 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,12024.0, 11634.1,11634.5,11634.7, diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index e4d5ee1118f3d..3a5f9d731e4f2 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -950,7 +950,7 @@ def setup_(self, step, stepName, stepDict, k, properties): dd4hepGeom+=stepDict[step][k]['--geometry'] stepDict[stepName][k] = merge([{'--geometry' : dd4hepGeom, '--procModifiers': 'dd4hep'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return ((fragment=='TTbar_13' or fragment=='TTbar_14' or fragment=='ZMM_13' or fragment=='SingleMuPt10') and '2021' in key) \ + return ((fragment=='TTbar_14TeV' or fragment=='ZMM_14' or fragment=='SingleMuPt10') and '2021' in key) \ or ((fragment=='TTbar_14TeV' or fragment=='ZMM_14' or fragment=='SingleMuPt10') and '2026' in key) upgradeWFs['DD4hep'] = UpgradeWorkflow_DD4hep( steps = [ diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index d646a30f65a45..09c3b926d9795 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -84,7 +84,7 @@ def runSelected(opt): 10024.0, #2017 ttbar 10224.0, #2017 ttbar PU 10824.0, #2018 ttbar - 11624.911, #2021 DD4hep ttbar + 11634.911, #2021 DD4hep ttbar 11634.0, #2021 ttbar 12434.0, #2023 ttbar 23234.0, #2026D49 ttbar (HLT TDR baseline w/ HGCal v11)