From 77d968412db126d8bd98e3d9b2ab486c024378c0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 6 May 2023 15:58:55 +0200 Subject: [PATCH 1/2] Split pp_on_PbPb era to match pp --- .../python/Era_Run3_pp_on_PbPb_2023_cff.py | 6 +++++ .../python/relval_steps.py | 22 +++++++++---------- .../StandardSequences/python/Eras.py | 2 ++ 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 Configuration/Eras/python/Era_Run3_pp_on_PbPb_2023_cff.py diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2023_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2023_cff.py new file mode 100644 index 0000000000000..4ca176860878b --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_2023_cff.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_pp_on_PbPb_cff import Run3_pp_on_PbPb +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 + +Run3_pp_on_PbPb_2023 = cms.ModifierChain(Run3_pp_on_PbPb, run3_egamma_2023) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 183e59b8cfd42..91c5e1cb422da 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -36,7 +36,7 @@ step1Up2018HiProdDefaults = merge ([{'--eventcontent':'RAWSIM'},step1Up2018HiDefaults]) # step1 gensim: for 2022 HI prod step1Up2022HiProdDefaults = merge ([{'--conditions':'auto:phase1_2022_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic2022PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) -step1Up2023HiProdDefaults = merge ([{'--conditions':'auto:phase1_2023_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic2022PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) +step1Up2023HiProdDefaults = merge ([{'--conditions':'auto:phase1_2023_realistic_hi','--era':'Run3_pp_on_PbPb_2023','--beamspot':'Realistic2022PbPbCollision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults]) steps = Steps() @@ -1067,8 +1067,8 @@ def genS(fragment,howMuch): hiDefaults2018_ppReco = {'--conditions':'auto:phase1_2018_realistic_hi', '--era':'Run2_2018_pp_on_AA'} hiDefaults2022_ppReco = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb'} hiDefaults2022_ppReco_approxClusters = {'--conditions':'auto:phase1_2022_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters'} -hiDefaults2023_ppReco = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb'} -hiDefaults2023_ppReco_approxClusters = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters'} +hiDefaults2023_ppReco = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_2023'} +hiDefaults2023_ppReco_approxClusters = {'--conditions':'auto:phase1_2023_realistic_hi', '--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023'} steps['Hydjet2Q_MinBias_5020GeV_2018_ppReco']=merge([{'-n':1},hiDefaults2018_ppReco,gen2018hiprod('Hydjet2_Quenched_MinBias_5020GeV_cfi',U2000by1)]) steps['HydjetQ_B12_5020GeV_2011']=merge([{'-n':1,'--beamspot':'RealisticHI2011Collision'},hiDefaults2011,genS('Hydjet_Quenched_B12_5020GeV_cfi',U2000by1)]) @@ -2919,20 +2919,20 @@ def gen2022HiMix(fragment,howMuch): steps['RECOHI2023PPRECOMBAPPROXCLUSTERS']=merge([hiDefaults2023_ppReco_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', - '--era':'Run3_pp_on_PbPb', + '--era':'Run3_pp_on_PbPb_2023', '--procModifiers':'genJetSubEvent', },step3Up2015Defaults]) steps['RECOHI2023PROD']=merge([hiDefaults2023_ppReco_approxClusters,{'-s':'RAW2DIGI,L1Reco,RECO', '--datatier':'AODSIM', '--eventcontent':'AODSIM', - '--era':'Run3_pp_on_PbPb', + '--era':'Run3_pp_on_PbPb_2023', },step3Up2015Defaults]) steps['MINIHI2023PROD']=merge([hiDefaults2023_ppReco,{'-s':'PAT', '--datatier':'MINIAODSIM', '--eventcontent':'MINIAODSIM', - '--era':'Run3_pp_on_PbPb', + '--era':'Run3_pp_on_PbPb_2023', '--procModifiers':'genJetSubEvent', },step3Up2015Defaults]) @@ -2943,14 +2943,14 @@ def gen2022HiMix(fragment,howMuch): steps['RECOHI2023PPRECOMB']=merge([hiDefaults2023_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM', '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', '--eventcontent':'RECOSIM,MINIAODSIM,DQM', - '--era':'Run3_pp_on_PbPb', + '--era':'Run3_pp_on_PbPb_2023', '--procModifiers':'genJetSubEvent', },step3Up2015Defaults]) steps['REMINIAODHI2023PPRECOMB']=merge([{'-s':'PAT,VALIDATION:@miniAODValidation,DQM:@miniAODDQM', '--datatier':'MINIAODSIM,DQMIO', '--eventcontent':'MINIAODSIM,DQM', '-n':100, - '--era':'Run3_pp_on_PbPb', + '--era':'Run3_pp_on_PbPb_2023', '--procModifiers':'genJetSubEvent', },hiDefaults2023_ppReco,step3Up2015Defaults]) @@ -3559,18 +3559,18 @@ def gen2022HiMix(fragment,howMuch): steps['HARVESTHI2023PPRECO']=merge([hiDefaults2023_ppReco,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', '--filein':'file:step3_inDQM.root', '--mc':'', - '--era' : 'Run3_pp_on_PbPb', + '--era' : 'Run3_pp_on_PbPb_2023', '--filetype':'DQM'}]) steps['HARVESTHI2023PPRECO4']=merge([hiDefaults2023_ppReco,{'-s':'HARVESTING:validationHarvestingNoHLT+dqmHarvestingFakeHLT', '--filein':'file:step4_inDQM.root', '--mc':'', - '--era' : 'Run3_pp_on_PbPb', + '--era' : 'Run3_pp_on_PbPb_2023', '--filetype':'DQM'}]) steps['HARVESTHI2023PPRECOMINIAOD']=merge([{'-s':'HARVESTING:@miniAODValidation+@miniAODDQM', '--filein':'file:step2_inDQM.root', '--mc':'', - '--era' : 'Run3_pp_on_PbPb', + '--era' : 'Run3_pp_on_PbPb_2023', '--filetype':'DQM', '-n':100},hiDefaults2023_ppReco]) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 9b1fc2834eacb..91b6fb8be3e87 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -38,6 +38,8 @@ def __init__(self): 'Run3_noMkFit', 'Run3_pp_on_PbPb', 'Run3_pp_on_PbPb_approxSiStripClusters', + 'Run3_pp_on_PbPb_2023', + 'Run3_pp_on_PbPb_approxSiStripClusters_2023', 'Run3_dd4hep', 'Run3_DDD', 'Run3_FastSim', From 07c5b2406172c265a74bb051123c31f128c66d9b Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 6 May 2023 16:00:36 +0200 Subject: [PATCH 2/2] missing file --- .../Era_Run3_pp_on_PbPb_approxSiStripClusters_2023_cff.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2023_cff.py diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2023_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2023_cff.py new file mode 100644 index 0000000000000..d02305c4ee75a --- /dev/null +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_approxSiStripClusters_2023_cff.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters +from Configuration.Eras.Modifier_run3_egamma_2023_cff import run3_egamma_2023 + +Run3_pp_on_PbPb_approxSiStripClusters_2023 = cms.ModifierChain(Run3_pp_on_PbPb_approxSiStripClusters, run3_egamma_2023)