From 77e8a9ec4080a9a37e2d8d239359e15da70bc946 Mon Sep 17 00:00:00 2001 From: Carl Vuosalo Date: Tue, 6 Jul 2021 00:39:41 +0200 Subject: [PATCH 1/4] Add DD4hep wf that reads from DB --- Configuration/PyReleaseValidation/README.md | 3 ++- .../PyReleaseValidation/python/relval_2017.py | 1 + .../python/upgradeWorkflowComponents.py | 25 +++++++++++++++++++ .../scripts/runTheMatrix.py | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index a4caaddabebfa..4c43222519724 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -57,7 +57,8 @@ The offsets currently in use are: * 0.999: 0.99 with Phase-2 premixing with PU50 * 0.9821: Production-like premixing stage2 * 0.9921: Production-like premixing stage1+stage2 -* 0.911: DD4Hep +* 0.911: DD4Hep reading geometry from XML +* 0.912: DD4Hep reading geometry from the DB * 0.101: Phase-2 aging, 1000fb-1 * 0.103: Phase-2 aging, 3000fb-1 * 0.9001: Sonic Triton diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 59f92409218f6..440b8d120f04a 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -55,6 +55,7 @@ 10824.511, 10824.521, 11634.911, 11650.911, + 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 50c75fae4b750..399fe011d8e68 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -1008,6 +1008,31 @@ def condition(self, fragment, stepList, key, hasHarvest): ) upgradeWFs['DD4hep'].allowReuse = False +class UpgradeWorkflow_DD4hepDB(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + if 'Run3' in stepDict[step][k]['--era']: + stepDict[stepName][k] = merge([{'--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) + def condition(self, fragment, stepList, key, hasHarvest): + return '2021' in key +upgradeWFs['DD4hepDB'] = UpgradeWorkflow_DD4hepDB( + steps = [ + 'GenSim', + 'GenSimHLBeamSpot', + 'GenSimHLBeamSpot14', + 'Digi', + 'DigiTrigger', + 'Reco', + 'RecoGlobal', + 'HARVEST', + 'HARVESTGlobal', + 'ALCA', + ], + PU = [], + suffix = '_DD4hepDB', + offset = 0.912, +) +upgradeWFs['DD4hepDB'].allowReuse = False + class UpgradeWorkflow_SonicTriton(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): stepDict[stepName][k] = merge([{'--procModifiers': 'allSonicTriton'}, stepDict[step][k]]) diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 55d89e6913634..aba12bc74d4e9 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -87,7 +87,8 @@ def runSelected(opt): 10024.0, #2017 ttbar 10224.0, #2017 ttbar PU 10824.0, #2018 ttbar - 11634.911, #2021 DD4hep ttbar + 11634.911, #2021 DD4hep ttbar reading geometry from XML + 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) From 545522efbbd29dacc9495f0ae8b9d4fc2b780248 Mon Sep 17 00:00:00 2001 From: Carl Vuosalo Date: Tue, 6 Jul 2021 05:54:32 +0200 Subject: [PATCH 2/4] Add special DD4hep GT --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 399fe011d8e68..13668501f0fd9 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -1011,7 +1011,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([{'--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) + stepDict[stepName][k] = merge([{'--conditions': 'specialDD4hepTEST_120X_mcRun3_2021_realistic_v1_Candidate_2021_07_05_22_26_22', '--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return '2021' in key upgradeWFs['DD4hepDB'] = UpgradeWorkflow_DD4hepDB( From a2933c99ff7dd731369cd6711724993ce502847c Mon Sep 17 00:00:00 2001 From: Carl Vuosalo Date: Wed, 7 Jul 2021 21:58:24 +0200 Subject: [PATCH 3/4] Take out of relval for now --- Configuration/PyReleaseValidation/python/relval_2017.py | 2 +- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 440b8d120f04a..ef378f7bf7c72 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, + # 11634.912, # Wait until CondDB issues resolved 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 13668501f0fd9..64a4f21dc66a3 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -1011,7 +1011,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_05_22_26_22', '--geometry': 'DB:Extended', '--procModifiers': 'dd4hep'}, stepDict[step][k]]) + 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]]) def condition(self, fragment, stepList, key, hasHarvest): return '2021' in key upgradeWFs['DD4hepDB'] = UpgradeWorkflow_DD4hepDB( From 05beb78f45a507ef67abd6bb37ab16ec3f2f3e29 Mon Sep 17 00:00:00 2001 From: Carl Vuosalo Date: Thu, 8 Jul 2021 13:06:58 +0200 Subject: [PATCH 4/4] Comment out 912 in short matrix --- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index aba12bc74d4e9..f4efc01c725d1 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 + # 11634.912, #2021 DD4hep ttbar reading geometry from the DB, wait for CondDB fix 11634.0, #2021 ttbar 12434.0, #2023 ttbar 23234.0, #2026D49 ttbar (HLT TDR baseline w/ HGCal v11)