diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index bea88e21c1a36..5bde3ca7398ef 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -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, diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 29e4aaef27a95..7728919e058cd 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -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 diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 85c512b721783..e55ea157ac589 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -203,6 +203,8 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['baseline'] = UpgradeWorkflow_baseline( steps = [ 'Gen', + 'GenHLBeamSpot', + 'GenHLBeamSpot14', 'Sim', 'GenSim', 'GenSimHLBeamSpot', @@ -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',