From 274d0b5461d38ee8ffd0cca29159fa4a54da2291 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 29 Jan 2022 17:04:44 +0100 Subject: [PATCH 1/8] add D88 to short matrix --- Configuration/PyReleaseValidation/python/relval_2026.py | 4 +++- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index 5e20568ad2d32..e06bc780e7294 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -38,8 +38,10 @@ numWFIB.extend([37834.0]) #2026D84 numWFIB.extend([38234.0]) #2026D85 numWFIB.extend([38634.0]) #2026D86 -numWFIB.extend([39034.0]) #2026D87 +numWFIB.extend([39034.0]) #2026D87 numWFIB.extend([39434.0,39434.5,39434.501,39434.502]) #2026D88, pixelTrackingOnly, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU +numWFIB.extend([39634.99,39634.999]) #2026D88 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) +numWFIB.extend([39434.21,39634.21,39634.9921]) #2026D88 prodlike, prodlike PU, prodlike premix stage1+stage2 numWFIB.extend([39834.0]) #2026D89 numWFIB.extend([40234.0]) #2026D90 diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 185164d43e20a..58ae715a39cf1 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -97,7 +97,9 @@ def runSelected(opt): 28234.0, #2026D60 (exercise HF nose) 35034.0, #2026D77 ttbar (2021 new baseline) 35234.999, #2026D77 ttbar premixing stage1+stage2, PU50 - 38634.0, #2026D86 ttbar + #38634.0, #2026D86 ttbar + 39434.0, #2026D88 ttbar + 39634.0, #2026D88 ttbar premixing stage1+stage2, PU50 25202.0, #2016 ttbar UP15 PU 250202.181, #2018 ttbar stage1 + stage2 premix ], From 7f8b540d7970cae3bfd80b7bcf521ec81e646f1b Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 29 Jan 2022 17:07:06 +0100 Subject: [PATCH 2/8] remove unused space --- Configuration/PyReleaseValidation/python/relval_2026.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index e06bc780e7294..d2f514dcbb42e 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -38,7 +38,7 @@ numWFIB.extend([37834.0]) #2026D84 numWFIB.extend([38234.0]) #2026D85 numWFIB.extend([38634.0]) #2026D86 -numWFIB.extend([39034.0]) #2026D87 +numWFIB.extend([39034.0]) #2026D87 numWFIB.extend([39434.0,39434.5,39434.501,39434.502]) #2026D88, pixelTrackingOnly, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU numWFIB.extend([39634.99,39634.999]) #2026D88 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) numWFIB.extend([39434.21,39634.21,39634.9921]) #2026D88 prodlike, prodlike PU, prodlike premix stage1+stage2 From bf5fb396f8cd0a0f1fa585f25fda797b907bf52e Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 29 Jan 2022 17:15:10 +0100 Subject: [PATCH 3/8] add D86 back for the moment --- 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 58ae715a39cf1..85f9365ebaa09 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -97,7 +97,7 @@ def runSelected(opt): 28234.0, #2026D60 (exercise HF nose) 35034.0, #2026D77 ttbar (2021 new baseline) 35234.999, #2026D77 ttbar premixing stage1+stage2, PU50 - #38634.0, #2026D86 ttbar + 38634.0, #2026D86 ttbar 39434.0, #2026D88 ttbar 39634.0, #2026D88 ttbar premixing stage1+stage2, PU50 25202.0, #2016 ttbar UP15 PU From 3bdb59e80574aa3024d69e26175364a7b5d4e666 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sun, 30 Jan 2022 02:04:17 +0100 Subject: [PATCH 4/8] correct wf number --- 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 85f9365ebaa09..3b6eec7eb19e4 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -99,7 +99,7 @@ def runSelected(opt): 35234.999, #2026D77 ttbar premixing stage1+stage2, PU50 38634.0, #2026D86 ttbar 39434.0, #2026D88 ttbar - 39634.0, #2026D88 ttbar premixing stage1+stage2, PU50 + 39634.999, #2026D88 ttbar premixing stage1+stage2, PU50 25202.0, #2016 ttbar UP15 PU 250202.181, #2018 ttbar stage1 + stage2 premix ], From eb86367f7b4107fbd20af3a732621d81530d4534 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sun, 30 Jan 2022 04:33:02 +0100 Subject: [PATCH 5/8] update minbias for D88 --- Configuration/PyReleaseValidation/python/relval_steps.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 1bbd079ee3fde..fa1f2bd00eff7 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3464,6 +3464,7 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v' defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v' defaultDataSets['2026D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v' +defaultDataSets['2026D88']='CMSSW_12_2_0_pre3-122X_mcRun4_realistic_v4_2026D88noPU-v1' puDataSets = {} for key, value in defaultDataSets.items(): puDataSets[key+'PU'] = value From 95bb9fe9c57a9dbaf32453789bb643b1bb600552 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sun, 30 Jan 2022 04:38:48 +0100 Subject: [PATCH 6/8] update list of 2026 wfs --- Configuration/PyReleaseValidation/python/relval_2026.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index d2f514dcbb42e..4f518f3278e67 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -39,7 +39,7 @@ numWFIB.extend([38234.0]) #2026D85 numWFIB.extend([38634.0]) #2026D86 numWFIB.extend([39034.0]) #2026D87 -numWFIB.extend([39434.0,39434.5,39434.501,39434.502]) #2026D88, pixelTrackingOnly, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU +numWFIB.extend([39434.0,39434.5,39434.501,39434.502,39434.911,39434.912]) #2026D88, pixelTrackingOnly, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU, DD4hep XML, DD4hep DB (not available yet, for future test) numWFIB.extend([39634.99,39634.999]) #2026D88 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) numWFIB.extend([39434.21,39634.21,39634.9921]) #2026D88 prodlike, prodlike PU, prodlike premix stage1+stage2 numWFIB.extend([39834.0]) #2026D89 From 294f89e2b9d4966342f24006078d48b578497437 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sun, 30 Jan 2022 06:52:02 +0100 Subject: [PATCH 7/8] update list of 2026 wfs --- Configuration/PyReleaseValidation/python/relval_2026.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index 4f518f3278e67..8e24207fabad4 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -39,7 +39,7 @@ numWFIB.extend([38234.0]) #2026D85 numWFIB.extend([38634.0]) #2026D86 numWFIB.extend([39034.0]) #2026D87 -numWFIB.extend([39434.0,39434.5,39434.501,39434.502,39434.911,39434.912]) #2026D88, pixelTrackingOnly, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU, DD4hep XML, DD4hep DB (not available yet, for future test) +numWFIB.extend([39434.0,39434.5,39434.501,39434.502,39434.911]) #2026D88, pixelTrackingOnly, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU, DD4hep XML numWFIB.extend([39634.99,39634.999]) #2026D88 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test) numWFIB.extend([39434.21,39634.21,39634.9921]) #2026D88 prodlike, prodlike PU, prodlike premix stage1+stage2 numWFIB.extend([39834.0]) #2026D89 From 2a7d29ac7dd9bea7433212e73f7572965cb84b24 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Tue, 1 Feb 2022 08:21:33 +0100 Subject: [PATCH 8/8] update short matrix list --- Configuration/PyReleaseValidation/python/relval_2026.py | 5 +++++ Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py index 8e24207fabad4..7a5e4d547c364 100644 --- a/Configuration/PyReleaseValidation/python/relval_2026.py +++ b/Configuration/PyReleaseValidation/python/relval_2026.py @@ -45,5 +45,10 @@ numWFIB.extend([39834.0]) #2026D89 numWFIB.extend([40234.0]) #2026D90 +#additional sample for short matrix +#CloseByPGun +numWFIB.extend([39496.0]) #CE_E_Front_120um D88 +numWFIB.extend([39500.0]) #CE_H_Coarse_Scint D88 + for numWF in numWFIB: workflows[numWF] = _upgrade_workflows[numWF] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index fa1f2bd00eff7..56ba23f564cd4 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3464,7 +3464,7 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2026D49']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D49noPU-v' defaultDataSets['2026D76']='CMSSW_12_0_0_pre4-113X_mcRun4_realistic_v7_2026D76noPU-v' defaultDataSets['2026D77']='CMSSW_12_1_0_pre2-113X_mcRun4_realistic_v7_2026D77noPU-v' -defaultDataSets['2026D88']='CMSSW_12_2_0_pre3-122X_mcRun4_realistic_v4_2026D88noPU-v1' +#defaultDataSets['2026D88']='CMSSW_12_2_0_pre3-122X_mcRun4_realistic_v4_2026D88noPU-v1' puDataSets = {} for key, value in defaultDataSets.items(): puDataSets[key+'PU'] = value diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 3b6eec7eb19e4..4664299090288 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -97,9 +97,11 @@ def runSelected(opt): 28234.0, #2026D60 (exercise HF nose) 35034.0, #2026D77 ttbar (2021 new baseline) 35234.999, #2026D77 ttbar premixing stage1+stage2, PU50 - 38634.0, #2026D86 ttbar + 38634.0, #2026D86 ttbar (to be removed when migration to D88 is complete) 39434.0, #2026D88 ttbar - 39634.999, #2026D88 ttbar premixing stage1+stage2, PU50 + #39634.999, #2026D88 ttbar premixing stage1+stage2, PU50 (to disable when PU is available) + 39496.0, #CE_E_Front_120um D88 + 39500.0, #CE_H_Coarse_Scint D88 25202.0, #2016 ttbar UP15 PU 250202.181, #2018 ttbar stage1 + stage2 premix ],