From 860d91e3b5b2b117dff5dd08589afa0873663c4c Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Thu, 11 Aug 2022 21:54:33 +0200 Subject: [PATCH 1/6] update pileup datasets for run3 --- Configuration/PyReleaseValidation/python/relval_steps.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index b404cfb1a53d9..e02582cf171f8 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3710,11 +3710,11 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2017Design']='CMSSW_12_0_0_pre4-113X_mc2017_design_v5-v' defaultDataSets['2018']='CMSSW_12_0_0_pre4-113X_upgrade2018_realistic_v5-v' defaultDataSets['2018Design']='CMSSW_12_0_0_pre4-113X_upgrade2018_design_v5-v' -defaultDataSets['2021']='CMSSW_12_0_0_pre4-120X_mcRun3_2021_realistic_v2-v' +defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' defaultDataSets['2021Design']='CMSSW_12_0_0_pre4-120X_mcRun3_2021_design_v2-v' defaultDataSets['2021FS']='CMSSW_12_4_0_pre4-124X_mcRun3_2021_realistic_v1_Run3FastSim_FastSim-v' -defaultDataSets['2023']='CMSSW_12_0_0_pre4-120X_mcRun3_2023_realistic_v2-v' -defaultDataSets['2024']='CMSSW_12_0_0_pre4-120X_mcRun3_2024_realistic_v2-v' +defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' +defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' 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' From e1428dac1d913967070c1bfe7a75f96b40555eb3 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Sat, 13 Aug 2022 11:15:46 +0200 Subject: [PATCH 2/6] use minbias datasets with correct beamspot --- .../PyReleaseValidation/python/relval_steps.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e02582cf171f8..d620a9cc5efc0 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3710,11 +3710,11 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2017Design']='CMSSW_12_0_0_pre4-113X_mc2017_design_v5-v' defaultDataSets['2018']='CMSSW_12_0_0_pre4-113X_upgrade2018_realistic_v5-v' defaultDataSets['2018Design']='CMSSW_12_0_0_pre4-113X_upgrade2018_design_v5-v' -defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' -defaultDataSets['2021Design']='CMSSW_12_0_0_pre4-120X_mcRun3_2021_design_v2-v' -defaultDataSets['2021FS']='CMSSW_12_4_0_pre4-124X_mcRun3_2021_realistic_v1_Run3FastSim_FastSim-v' -defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' -defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' +defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_realistic-v1' +defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7_design-v2' +defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_Run3FastSim_FastSim-v1' +defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_realistic-v1' +defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_realistic-v1' 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' From 14e1a54341e53dc31ee4dcf79407b0c751750126 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Sun, 14 Aug 2022 08:57:24 +0200 Subject: [PATCH 3/6] update minbias --- .../PyReleaseValidation/python/relval_steps.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index d620a9cc5efc0..a5f56b7edfd4c 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3710,11 +3710,11 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2017Design']='CMSSW_12_0_0_pre4-113X_mc2017_design_v5-v' defaultDataSets['2018']='CMSSW_12_0_0_pre4-113X_upgrade2018_realistic_v5-v' defaultDataSets['2018Design']='CMSSW_12_0_0_pre4-113X_upgrade2018_design_v5-v' -defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_realistic-v1' -defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7_design-v2' -defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_Run3FastSim_FastSim-v1' -defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_realistic-v1' -defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_realistic-v1' +defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v2' +defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7-v1' +defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_FastSim-v1' +defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v2' +defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v2' 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' From de3d13961aaca376d618cce97078cb7ff2a53f84 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Sun, 14 Aug 2022 13:07:34 +0200 Subject: [PATCH 4/6] update --- .../PyReleaseValidation/python/relval_steps.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index a5f56b7edfd4c..799593f5523aa 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3710,11 +3710,11 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2017Design']='CMSSW_12_0_0_pre4-113X_mc2017_design_v5-v' defaultDataSets['2018']='CMSSW_12_0_0_pre4-113X_upgrade2018_realistic_v5-v' defaultDataSets['2018Design']='CMSSW_12_0_0_pre4-113X_upgrade2018_design_v5-v' -defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v2' -defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7-v1' -defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_FastSim-v1' -defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v2' -defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v2' +defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' +defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7-v' +defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_FastSim-v' +defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' +defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' 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' @@ -3725,14 +3725,14 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets.update(puDataSets) # sometimes v1 won't be used - override it here - the dictionary key is gen fragment + '_' + geometry -versionOverrides={'BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_2017':'2','HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_2017':'2','RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_2017':'2','WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_2017':'2','DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_2017':'2','TenE_E_0_200_pythia8_2017':'2','TenE_E_0_200_pythia8_2017PU':'2', 'TenTau_E_15_500_pythia8_2018':'2','PhotonJet_Pt_10_13TeV_TuneCUETP8M1_2018':'2','Wjet_Pt_80_120_13TeV_TuneCUETP8M1_2018':'2'} +versionOverrides={'BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_2017':'2','HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_2017':'2','RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_2017':'2','WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_2017':'2','DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_2017':'2','TenE_E_0_200_pythia8_2017':'2','TenE_E_0_200_pythia8_2017PU':'2', 'TenTau_E_15_500_pythia8_2018':'2','PhotonJet_Pt_10_13TeV_TuneCUETP8M1_2018':'2','Wjet_Pt_80_120_13TeV_TuneCUETP8M1_2018':'2','MinBias_14TeV_pythia8_TuneCP5_2021':'2','MinBias_14TeV_pythia8_TuneCP5_2023':'2','MinBias_14TeV_pythia8_TuneCP5_2024':'2'} baseDataSetReleaseBetter={} for gen in upgradeFragments: for ds in defaultDataSets: key=gen[:-4]+'_'+ds version='1' - if key in versionOverrides: + if key in versionOverrides and 'FastSim' not in defaultDataSets[ds] and 'design' not in defaultDataSets[ds]: version = versionOverrides[key] baseDataSetReleaseBetter[key]=defaultDataSets[ds]+version From ed7ffeb94413e407db2e40d55ac90a1e492c0fad Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Thu, 18 Aug 2022 13:22:58 +0200 Subject: [PATCH 5/6] update --- .../PyReleaseValidation/python/relval_steps.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 799593f5523aa..965fb65b4c8cb 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3710,11 +3710,11 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2017Design']='CMSSW_12_0_0_pre4-113X_mc2017_design_v5-v' defaultDataSets['2018']='CMSSW_12_0_0_pre4-113X_upgrade2018_realistic_v5-v' defaultDataSets['2018Design']='CMSSW_12_0_0_pre4-113X_upgrade2018_design_v5-v' -defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' -defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7-v' -defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_FastSim-v' -defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' -defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10-v' +defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v' +defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7_BS2022-v' +defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022_FastSim-v' +defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v' +defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v' 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' @@ -3725,14 +3725,14 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets.update(puDataSets) # sometimes v1 won't be used - override it here - the dictionary key is gen fragment + '_' + geometry -versionOverrides={'BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_2017':'2','HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_2017':'2','RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_2017':'2','WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_2017':'2','DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_2017':'2','TenE_E_0_200_pythia8_2017':'2','TenE_E_0_200_pythia8_2017PU':'2', 'TenTau_E_15_500_pythia8_2018':'2','PhotonJet_Pt_10_13TeV_TuneCUETP8M1_2018':'2','Wjet_Pt_80_120_13TeV_TuneCUETP8M1_2018':'2','MinBias_14TeV_pythia8_TuneCP5_2021':'2','MinBias_14TeV_pythia8_TuneCP5_2023':'2','MinBias_14TeV_pythia8_TuneCP5_2024':'2'} +versionOverrides={'BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_2017':'2','HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_2017':'2','RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_2017':'2','WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_2017':'2','DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_2017':'2','TenE_E_0_200_pythia8_2017':'2','TenE_E_0_200_pythia8_2017PU':'2', 'TenTau_E_15_500_pythia8_2018':'2','PhotonJet_Pt_10_13TeV_TuneCUETP8M1_2018':'2','Wjet_Pt_80_120_13TeV_TuneCUETP8M1_2018':'2'} baseDataSetReleaseBetter={} for gen in upgradeFragments: for ds in defaultDataSets: key=gen[:-4]+'_'+ds version='1' - if key in versionOverrides and 'FastSim' not in defaultDataSets[ds] and 'design' not in defaultDataSets[ds]: + if key in versionOverrides: version = versionOverrides[key] baseDataSetReleaseBetter[key]=defaultDataSets[ds]+version From bcf184a1f24f47dd53ad77a0e4de32b74dadc488 Mon Sep 17 00:00:00 2001 From: Kirill Skovpen Date: Mon, 22 Aug 2022 21:34:42 +0200 Subject: [PATCH 6/6] update --- Configuration/PyReleaseValidation/python/relval_2017.py | 5 +++-- Configuration/PyReleaseValidation/python/relval_steps.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 3f19c035eabfc..891b5a8b5c9f6 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -31,7 +31,7 @@ # 2021 (DD4hep XML: TTbar, ZMM) # (DDD DB: 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, GluGluTo2Jets, GluGluTo2Jets PU) +# (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design) # (TTbar trackingOnly, pixelTrackingOnly, trackingMkFit, trackdnn) # (Patatrack pixel-only: ZMM - on CPU: quadruplets, triplets) # (Patatrack pixel-only: TTbar - on CPU: quadruplets, triplets) @@ -64,7 +64,8 @@ 11634.911, 11650.911, 11634.914, 11650.914, 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, + 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.71,11634.72,11634.91, 11650.501,11650.505, 11634.501,11634.505, diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 965fb65b4c8cb..2c890907ca043 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3711,10 +3711,10 @@ def gen2021HiMix(fragment,howMuch): defaultDataSets['2018']='CMSSW_12_0_0_pre4-113X_upgrade2018_realistic_v5-v' defaultDataSets['2018Design']='CMSSW_12_0_0_pre4-113X_upgrade2018_design_v5-v' defaultDataSets['2021']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v' -defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7_BS2022-v' +defaultDataSets['2021Design']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_design_v7_design_BS2022-v' defaultDataSets['2021FS']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022_FastSim-v' -defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v' -defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2022_realistic_v10_BS2022-v' +defaultDataSets['2023']='CMSSW_12_5_0_pre4-124X_mcRun3_2023_realistic_v11_BS2022-v' +defaultDataSets['2024']='CMSSW_12_5_0_pre4-124X_mcRun3_2024_realistic_v11_BS2022-v' 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'