Skip to content

Commit

Permalink
Merge pull request #41571 from mandrenguyen/hiEra2023
Browse files Browse the repository at this point in the history
Introduce variant of `pp_on_PbPb` era for 2023
  • Loading branch information
cmsbuild authored May 11, 2023
2 parents d636fed + 07c5b24 commit 50ce753
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 11 deletions.
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Run3_pp_on_PbPb_2023_cff.py
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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)
22 changes: 11 additions & 11 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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)])
Expand Down Expand Up @@ -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])

Expand All @@ -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])

Expand Down Expand Up @@ -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])

Expand Down
2 changes: 2 additions & 0 deletions Configuration/StandardSequences/python/Eras.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 50ce753

Please sign in to comment.