Skip to content

Commit e1d8cde

Browse files
authored
Merge pull request #45875 from mandrenguyen/hiPURelVal2024
Add 2024 HiMix MC RelVal workflows
2 parents b53a380 + 40066e3 commit e1d8cde

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

Configuration/PyReleaseValidation/python/relval_pileup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
workflows[320]=['Pyquen_GammaJet_pt20_5362GeV_2023',['Pyquen_GammaJet_pt20_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
2727
workflows[321]=['Pyquen_DiJet_pt80to120_5362GeV_2023',['Pyquen_DiJet_pt80to120_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
2828
workflows[322]=['Pyquen_ZeemumuJets_pt10_5362GeV_2023',['Pyquen_ZeemumuJets_pt10_5362GeV_2023','DIGIHI2023MIX','RECOHI2023MIX','HARVESTHI2023PPRECO']]
29+
workflows[330]=['Pyquen_GammaJet_pt20_5362GeV_2024',['Pyquen_GammaJet_pt20_5362GeV_2024','DIGIHI2024MIX','RECOHI2024MIX','HARVESTHI2024']]
30+
workflows[331]=['Pyquen_DiJet_pt80to120_5362GeV_2024',['Pyquen_DiJet_pt80to120_5362GeV_2024','DIGIHI2024MIX','RECOHI2024MIX','HARVESTHI2024']]
31+
workflows[332]=['Pyquen_ZeemumuJets_pt10_5362GeV_2024',['Pyquen_ZeemumuJets_pt10_5362GeV_2024','DIGIHI2024MIX','RECOHI2024MIX','HARVESTHI2024']]
2932

3033
# 50 ns at 13 TeV and POSTLS1
3134
workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50_L1TEgDQM','HARVESTUP15_PU50_L1TEgDQM']]

Configuration/PyReleaseValidation/python/relval_steps.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,8 @@ def identitySim(wf):
960960
'CMSSW_12_5_1-125X_mcRun3_2022_realistic_HI_v5-v1', #23 - 2022 HI GEN-SIM for mixing
961961
'CMSSW_11_2_0_pre8-PU_112X_upgrade2018_realistic_v4-v1', # 24 - 2018 Run-Dependent premix library
962962
'CMSSW_13_2_0_pre1-131X_mcRun3_2023_realistic_HI_v11-v1', # 2023 HI GEN-SIM for mixing
963-
]
963+
'CMSSW_14_1_0_pre7-141X_mcRun3_2024_realistic_HI_v4_STD_Run3_HIN_MinBias_2024-v1', # 2024 HI GEN-SIM for mixing
964+
]
964965

965966
# note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available
966967
steps['MinBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} #was [0]
@@ -1912,6 +1913,7 @@ def lhegensim2018ml(fragment,howMuch):
19121913
PUHI={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2018/%s/GEN-SIM'%(baseDataSetRelease[9])}
19131914
PUHI2022={'-n':10,'--pileup_input':'das:/RelValHydjetQ_B12_5020GeV_2021_ppReco/%s/GEN-SIM'%(baseDataSetRelease[23])}
19141915
PUHI2023={'-n':10,'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[25])}
1916+
PUHI2024={'-n':10,'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2024/%s/GEN-SIM'%(baseDataSetRelease[26])}
19151917
PU25UP17={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[13],)}
19161918
PU25UP18={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[18],)}
19171919

@@ -2047,6 +2049,7 @@ def lhegensim2018ml(fragment,howMuch):
20472049
steps['DIGIHI2022PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2022_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
20482050
steps['DIGIHI2018PPRECO']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2018_ppReco, {'--pileup':'HiMixNoPU'}, step2Upg2015Defaults])
20492051
steps['DIGIHI2017']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2'}, hiDefaults2017, step2Upg2015Defaults])
2052+
steps['DIGIHI2024MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2024, {'--pileup':'HiMix'}, PUHI2024, step2Upg2015Defaults])
20502053
steps['DIGIHI2023MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2023_ppReco, {'--pileup':'HiMix'}, PUHI2023, step2Upg2015Defaults])
20512054
steps['DIGIHI2022MIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2022_ppReco, {'--pileup':'HiMix'}, PUHI2022, step2Upg2015Defaults])
20522055
steps['DIGIHIMIX']=merge([{'-s':'DIGI:pdigi_hi_nogen,L1,DIGI2RAW,HLT:@fake2', '-n':2}, hiDefaults2018_ppReco, {'--pileup':'HiMix'}, PUHI, step2Upg2015Defaults])
@@ -2816,6 +2819,11 @@ def gen2023HiMix(fragment,howMuch):
28162819
global step1Up2023HiMixDefaults
28172820
return merge([{'cfg':fragment},howMuch,step1Up2023HiMixDefaults])
28182821

2822+
step1Up2024HiMixDefaults = merge ([{'--beamspot':'MatchHI', '--pileup':'HiMixGEN', '--scenario':'HeavyIons'},hiDefaults2024,PUHI2024,step1Up2024HiProdDefaults])
2823+
def gen2024HiMix(fragment,howMuch):
2824+
global step1Up2024HiMixDefaults
2825+
return merge([{'cfg':fragment},howMuch,step1Up2024HiMixDefaults])
2826+
28192827
steps['Pyquen_GammaJet_pt20_2760GeV']=gen2018HiMix('Pyquen_GammaJet_pt20_2760GeV_cfi',Kby(9,100))
28202828
steps['Pyquen_DiJet_pt80to120_2760GeV']=gen2018HiMix('Pyquen_DiJet_pt80to120_2760GeV_cfi',Kby(9,100))
28212829
steps['Pyquen_ZeemumuJets_pt10_2760GeV']=gen2018HiMix('Pyquen_ZeemumuJets_pt10_2760GeV_cfi',Kby(9,100))
@@ -2825,6 +2833,9 @@ def gen2023HiMix(fragment,howMuch):
28252833
steps['Pyquen_GammaJet_pt20_5362GeV_2023']=gen2023HiMix('Pyquen_GammaJet_pt20_5362GeV_cfi',Kby(9,100))
28262834
steps['Pyquen_DiJet_pt80to120_5362GeV_2023']=gen2023HiMix('Pyquen_DiJet_pt80to120_5362GeV_cfi',Kby(9,100))
28272835
steps['Pyquen_ZeemumuJets_pt10_5362GeV_2023']=gen2023HiMix('Pyquen_ZeemumuJets_pt10_5362GeV_cfi',Kby(9,100))
2836+
steps['Pyquen_GammaJet_pt20_5362GeV_2024']=gen2024HiMix('Pyquen_GammaJet_pt20_5362GeV_cfi',Kby(9,100))
2837+
steps['Pyquen_DiJet_pt80to120_5362GeV_2024']=gen2024HiMix('Pyquen_DiJet_pt80to120_5362GeV_cfi',Kby(9,100))
2838+
steps['Pyquen_ZeemumuJets_pt10_5362GeV_2024']=gen2024HiMix('Pyquen_ZeemumuJets_pt10_5362GeV_cfi',Kby(9,100))
28282839

28292840
# step3
28302841
step3Defaults = {
@@ -3384,6 +3395,11 @@ def gen2023HiMix(fragment,howMuch):
33843395
'--procModifiers':'genJetSubEvent',
33853396
},step3Up2015Defaults])
33863397

3398+
steps['RECOHI2024MIX']=merge([hiDefaults2024,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
3399+
'--pileup':'HiMix',
3400+
'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2024/%s/GEN-SIM'%(baseDataSetRelease[26])
3401+
},step3Up2015Defaults])
3402+
33873403
steps['RECOHI2023MIX']=merge([hiDefaults2023_ppReco,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLTHiMix+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
33883404
'--pileup':'HiMix',
33893405
'--pileup_input':'das:/RelValHydjetQ_MinBias_5362GeV_2023_ppReco/%s/GEN-SIM'%(baseDataSetRelease[25])

0 commit comments

Comments
 (0)