From 68150ddb872e0697f4ad1aae45c0ebc8e0e01872 Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 1 Sep 2022 11:33:39 +0200 Subject: [PATCH 1/2] Add production-like Run 3 HI MC workflow to relval --- .../PyReleaseValidation/python/relval_standard.py | 6 ++++-- .../PyReleaseValidation/python/relval_steps.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index c527d7c70840e..b2a63975026e8 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -739,14 +739,16 @@ workflows[158.1] = ['',['QCD_Pt_80_120_13_HI','DIGIHI2018PPRECO','RECOHI2018PPRECO','HARVESTHI2018PPRECO']] workflows[158.2] = ['',['PhotonJets_Pt_10_13_HI','DIGIHI2018PPRECO','RECOHI2018PPRECO','HARVESTHI2018PPRECO']] workflows[158.3] = ['',['ZEEMM_13_HI','DIGIHI2018PPRECO','RECOHI2018PPRECO','HARVESTHI2018PPRECO']] +workflows[158.5] = ['',['Hydjet2Q_MinBias_5020GeV_2018_ppReco','DIGIHI2018PPRECO','RECOHI2018PPRECOMB','ALCARECOHI2018PPRECO','HARVESTHI2018PPRECO']] +### Run 3 cond., 2022 workflows[159] = ['',['HydjetQ_B12_5020GeV_2021_ppReco','DIGIHI2021PPRECO','RECOHI2021PPRECOMB','ALCARECOHI2021PPRECO','HARVESTHI2021PPRECO']] workflows[159.01] = ['',['HydjetQ_reminiaodPbPb2021_INPUT','REMINIAODHI2021PPRECOMB','HARVESTHI2021PPRECOMINIAOD']] +workflows[159.02] = ['',['HydjetQ_B12_5020GeV_2021_ppReco','DIGIHI2021PPRECO','RAWPRIMESIMHI18','RECOHI2021PPRECOMBAPPROXCLUSTERS','ALCARECOHI2021PPRECO','HARVESTHI2021PPRECO4']] +workflows[159.03] = ['',['HydjetQ_MinBias_5020GeV_2021_ppReco','DIGIHI2021PPRECO','RAWPRIMESIMHI18','RECOHI2022PROD','MINIHI2022PROD']] workflows[159.1] = ['',['QCD_Pt_80_120_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']] workflows[159.2] = ['',['PhotonJets_Pt_10_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']] workflows[159.3] = ['',['ZMM_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']] workflows[159.4] = ['',['ZEE_14_HI_2021','DIGIHI2021PPRECO','RECOHI2021PPRECO','HARVESTHI2021PPRECO']] -workflows[160] = ['',['Hydjet2Q_MinBias_5020GeV_2018_ppReco','DIGIHI2018PPRECO','RECOHI2018PPRECOMB','ALCARECOHI2018PPRECO','HARVESTHI2018PPRECO']] -workflows[161] = ['',['HydjetQ_B12_5020GeV_2021_ppReco','DIGIHI2021PPRECO','RAWPRIMESIMHI18','RECOHI2021PPRECOMBAPPROXCLUSTERS','ALCARECOHI2021PPRECO','HARVESTHI2021PPRECO4']] ### pp reference test ### workflows[149] = ['',['QCD_Pt_80_120_13_PPREF','DIGIPPREF2017','RECOPPREF2017','HARVESTPPREF2017']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e7404d66353d3..511133af50ed2 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1033,6 +1033,7 @@ def genS(fragment,howMuch): steps['HydjetQ_B12_5020GeV_2018']=merge([{'-n':1},hiDefaults2018,gen2018prod('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)]) steps['HydjetQ_B12_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)]) steps['HydjetQ_B12_5020GeV_2021_ppReco']=merge([{'-n':1},hiDefaults2021_ppReco,gen2021hiprod('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)]) +steps['HydjetQ_MinBias_5020GeV_2021_ppReco']=merge([{'-n':1},hiDefaults2021_ppReco,gen2021hiprod('Hydjet_Quenched_MinBias_5020GeV_cfi',U2000by1)]) steps['QCD_Pt_80_120_13_HI']=merge([hiDefaults2018_ppReco,gen2018hiprod('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,150))]) steps['PhotonJets_Pt_10_13_HI']=merge([hiDefaults2018_ppReco,gen2018hiprod('PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi',Kby(9,150))]) @@ -2806,6 +2807,19 @@ def gen2021HiMix(fragment,howMuch): '--procModifiers':'genJetSubEvent', },step3Up2015Defaults]) +steps['RECOHI2022PROD']=merge([hiDefaults2021_ppReco_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO', + '--datatier':'AOSSIM', + '--eventcontent':'AODSIM', + '--era':'Run3_pp_on_PbPb', + },step3Up2015Defaults]) + +steps['MINIHI2022PROD']=merge([hiDefaults2021_ppReco,{'-s':'PAT', + '--datatier':'MINIAODSIM', + '--eventcontent':'MINIAODSIM', + '--era':'Run3_pp_on_PbPb', + '--procModifiers':'genJetSubEvent', + },step3Up2015Defaults]) + steps['RECOHI2021PPRECO']=merge([hiDefaults2021_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', From 697a50f62c7fd51181e3a04dddb3b3c6119328b6 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 2 Sep 2022 10:51:58 +0200 Subject: [PATCH 2/2] fix typo --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 511133af50ed2..d030071bf61fd 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2808,7 +2808,7 @@ def gen2021HiMix(fragment,howMuch): },step3Up2015Defaults]) steps['RECOHI2022PROD']=merge([hiDefaults2021_ppReco_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO', - '--datatier':'AOSSIM', + '--datatier':'AODSIM', '--eventcontent':'AODSIM', '--era':'Run3_pp_on_PbPb', },step3Up2015Defaults])