Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4363,6 +4363,9 @@ def gen2023HiMix(fragment,howMuch):
}
if beamspot is not None: upgradeStepDict['Gen'][k]['--beamspot']=beamspot

upgradeStepDict['GenHLBeamSpot'][k] = merge([{'--conditions' : gt+'_13TeV'}, upgradeStepDict['Gen'][k]])
upgradeStepDict['GenHLBeamSpot14'][k] = merge([{}, upgradeStepDict['Gen'][k]])

upgradeStepDict['GenSim'][k]= {'-s' : 'GEN,SIM',
'-n' : 10,
'--conditions' : gt,
Expand Down
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ def notForGenOnly(key,specialType):
step = 'GenSimHLBeamSpotHGCALCloseBy'
stepMaker = makeStepNameSim
elif 'Gen' in step:
if 'HLBeamSpot' in step:
if '14TeV' in frag:
step = 'GenHLBeamSpot14'
stepMaker = makeStepNameSim

if 'HARVEST' in step: hasHarvest = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ def condition(self, fragment, stepList, key, hasHarvest):
upgradeWFs['baseline'] = UpgradeWorkflow_baseline(
steps = [
'Gen',
'GenHLBeamSpot',
'GenHLBeamSpot14',
'Sim',
'GenSim',
'GenSimHLBeamSpot',
Expand Down Expand Up @@ -3172,18 +3174,18 @@ def condition(self, fragment, stepList, key, hasHarvest):
},
'2026D110GenOnly' : {
'Geom' : 'Extended2026D110',
'Beamspot' : 'HLLHC',
'BeamSpot' : 'DBrealisticHLLHC',
'GT' : 'auto:phase2_realistic_T33',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['Gen'],
'ScenToRun' : ['GenHLBeamSpot'],
},
'2026D110SimOnGen' : {
'Geom' : 'Extended2026D110',
'HLTmenu': '@relval2026',
'Beamspot' : 'HLLHC',
'BeamSpot' : 'DBrealisticHLLHC',
'GT' : 'auto:phase2_realistic_T33',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['Gen','Sim','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
'ScenToRun' : ['GenHLBeamSpot','Sim','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'],
},
'2026D115' : {
'Geom' : 'Extended2026D115',
Expand Down