From 20856534d7468af21af5201c1525df358d787a7d Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 20 Jan 2023 14:12:33 -0600 Subject: [PATCH 1/2] add nanoAOD to run2 FS matrix workflows --- .../python/relval_standard.py | 60 +++++++++---------- .../python/relval_steps.py | 4 ++ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 212fda82d1ec6..81d4397b5a8f2 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -521,32 +521,32 @@ workflows[5.7] = ['H130GGgluonfusionFS', ['H130GGgluonfusionFS','HARVESTFS']] ### fastsim_13 TeV ### -workflows[135.1] = ['TTbarFS_13', ['TTbarFS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.2] = ['SingleMuPt10FS_UP15', ['SingleMuPt10FS_UP15','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.3] = ['SingleMuPt100FS_UP15', ['SingleMuPt100FS_UP15','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.4] = ['ZEEFS_13', ['ZEEFS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.5] = ['ZTTFS_13',['ZTTFS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.6] = ['QCD_FlatPt_15_3000FS_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.7] = ['H125GGgluonfusionFS_13', ['H125GGgluonfusionFS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.9] = ['ZMMFS_13',['ZMMFS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13','HARVESTUP15FS','MINIAODMCUP15FS']] -workflows[135.12] = ['QCD_Pt_80_120FS_13', ['QCD_Pt_80_120FS_13','HARVESTUP15FS','MINIAODMCUP15FS']] +workflows[135.1] = ['TTbarFS_13', ['TTbarFS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.2] = ['SingleMuPt10FS_UP15', ['SingleMuPt10FS_UP15','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.3] = ['SingleMuPt100FS_UP15', ['SingleMuPt100FS_UP15','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.4] = ['ZEEFS_13', ['ZEEFS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.5] = ['ZTTFS_13',['ZTTFS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.6] = ['QCD_FlatPt_15_3000FS_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.7] = ['H125GGgluonfusionFS_13', ['H125GGgluonfusionFS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.9] = ['ZMMFS_13',['ZMMFS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] +workflows[135.12] = ['QCD_Pt_80_120FS_13', ['QCD_Pt_80_120FS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] workflows[135.13] = ['TTbarFS_13', ['TTbarFS_13_trackingOnlyValidation','HARVESTUP15FS_trackingOnly']] ### MinBias fastsim_13 TeV for mixing ### workflows[135.8] = ['MinBiasFS_13',['MinBiasFS_13_ForMixing']] ### Phase1 FastSim 13TeV ### -workflows[2017.1] = ['TTbarFS_13_UP17', ['TTbarFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.2] = ['SingleMuPt10FS_UP17', ['SingleMuPt10FS_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.3] = ['SingleMuPt100FS_UP17', ['SingleMuPt100FS_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.4] = ['ZEEFS_13_UP17', ['ZEEFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.5] = ['ZTTFS_13_UP17',['ZTTFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.6] = ['QCD_FlatPt_15_3000FS_13_UP17', ['QCDFlatPt153000FS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.7] = ['H125GGgluonfusionFS_13_UP17', ['H125GGgluonfusionFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.9] = ['ZMMFS_13_UP17',['ZMMFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP17', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] -workflows[2017.12] = ['QCD_Pt_80_120FS_13_UP17', ['QCD_Pt_80_120FS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS']] +workflows[2017.1] = ['TTbarFS_13_UP17', ['TTbarFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.2] = ['SingleMuPt10FS_UP17', ['SingleMuPt10FS_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.3] = ['SingleMuPt100FS_UP17', ['SingleMuPt100FS_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.4] = ['ZEEFS_13_UP17', ['ZEEFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.5] = ['ZTTFS_13_UP17',['ZTTFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.6] = ['QCD_FlatPt_15_3000FS_13_UP17', ['QCDFlatPt153000FS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.7] = ['H125GGgluonfusionFS_13_UP17', ['H125GGgluonfusionFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.9] = ['ZMMFS_13_UP17',['ZMMFS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP17', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] +workflows[2017.12] = ['QCD_Pt_80_120FS_13_UP17', ['QCD_Pt_80_120FS_13_UP17','HARVESTUP17FS','MINIAODMCUP17FS','NANOUP17FS']] workflows[2017.13] = ['TTbarFS_13_UP17', ['TTbarFS_13_trackingOnlyValidation_UP17','HARVESTUP17FS_trackingOnly']] ### MinBias fastsim_13 TeV for mixing ### @@ -556,16 +556,16 @@ workflows[2018.8] = ['MinBiasFS_13_UP18',['MinBiasFS_13_UP18_ForMixing']] ### Phase1 FastSim 13TeV, 2018 ### -workflows[2018.1] = ['TTbarFS_13_UP18', ['TTbarFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.2] = ['SingleMuPt10FS_UP18', ['SingleMuPt10FS_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.3] = ['SingleMuPt100FS_UP18', ['SingleMuPt100FS_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.4] = ['ZEEFS_13_UP18', ['ZEEFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.5] = ['ZTTFS_13_UP18',['ZTTFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.6] = ['QCD_FlatPt_15_3000FS_13_UP18', ['QCDFlatPt153000FS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.7] = ['H125GGgluonfusionFS_13_UP18', ['H125GGgluonfusionFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.9] = ['ZMMFS_13_UP18',['ZMMFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP18', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] -workflows[2018.12] = ['QCD_Pt_80_120FS_13_UP18', ['QCD_Pt_80_120FS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS']] +workflows[2018.1] = ['TTbarFS_13_UP18', ['TTbarFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.2] = ['SingleMuPt10FS_UP18', ['SingleMuPt10FS_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.3] = ['SingleMuPt100FS_UP18', ['SingleMuPt100FS_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.4] = ['ZEEFS_13_UP18', ['ZEEFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.5] = ['ZTTFS_13_UP18',['ZTTFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.6] = ['QCD_FlatPt_15_3000FS_13_UP18', ['QCDFlatPt153000FS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.7] = ['H125GGgluonfusionFS_13_UP18', ['H125GGgluonfusionFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.9] = ['ZMMFS_13_UP18',['ZMMFS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP18', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] +workflows[2018.12] = ['QCD_Pt_80_120FS_13_UP18', ['QCD_Pt_80_120FS_13_UP18','HARVESTUP18FS','MINIAODMCUP18FS','NANOUP18FS']] workflows[2018.13] = ['TTbarFS_13_UP18', ['TTbarFS_13_trackingOnlyValidation_UP18','HARVESTUP18FS_trackingOnly']] ### standard set ### diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 15e228724a5f2..bda18cb450757 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3728,6 +3728,10 @@ def gen2021HiMix(fragment,howMuch): steps['NANOUP18Had']=merge([{'--filein':'file:step4_inMINIAODSIM.root'},steps['NANOUP18']]) steps['NANOPRODUP18']=merge([{'--filein':'file:step4.root'},steps['NANOUP18']]) +steps['NANOUP15FS'] = merge([{'--filein':'file:step3.root','--fast':''}, steps['NANOUP15']]) +steps['NANOUP17FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2017_FastSim'}, steps['NANOUP17']]) +steps['NANOUP18FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2018_FastSim'}, steps['NANOUP18']]) + steps['HEfail'] = {'--conditions':'auto:phase1_2018_realistic_HEfail', '-n':'10', From 565306c27001ff483e1e995fd6777aca4b59b623 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 20 Jan 2023 18:21:24 -0600 Subject: [PATCH 2/2] add test 2016 workflow for fastsim refinement --- Configuration/PyReleaseValidation/python/relval_standard.py | 1 + Configuration/PyReleaseValidation/python/relval_steps.py | 1 + 2 files changed, 2 insertions(+) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 81d4397b5a8f2..7b61a1ce392d2 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -532,6 +532,7 @@ workflows[135.11] = ['SMS-T1tttt_mGl-1500_mLSP-100FS_13', ['SMS-T1tttt_mGl-1500_mLSP-100FS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] workflows[135.12] = ['QCD_Pt_80_120FS_13', ['QCD_Pt_80_120FS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FS']] workflows[135.13] = ['TTbarFS_13', ['TTbarFS_13_trackingOnlyValidation','HARVESTUP15FS_trackingOnly']] +workflows[135.14] = ['TTbarFS_13', ['TTbarFS_13','HARVESTUP15FS','MINIAODMCUP15FS','NANOUP15FSrefine']] ### MinBias fastsim_13 TeV for mixing ### workflows[135.8] = ['MinBiasFS_13',['MinBiasFS_13_ForMixing']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index bda18cb450757..d701ed7e329a0 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3732,6 +3732,7 @@ def gen2021HiMix(fragment,howMuch): steps['NANOUP17FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2017_FastSim'}, steps['NANOUP17']]) steps['NANOUP18FS'] = merge([{'--filein':'file:step3.root','--fast':'','--era':'Run2_2018_FastSim'}, steps['NANOUP18']]) +steps['NANOUP15FSrefine'] = merge([{'--customise':'PhysicsTools/NanoAOD/jetsAK4_CHS_cff.nanoAOD_refineFastSim_bTagDeepFlav'}, steps['NANOUP15FS']]) steps['HEfail'] = {'--conditions':'auto:phase1_2018_realistic_HEfail', '-n':'10',