diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index 83f761360d04e..07c5334777713 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -71,6 +71,7 @@ The offsets currently in use are: * 0.914: DDD DB * 0.101: Phase-2 aging, 1000fb-1 * 0.103: Phase-2 aging, 3000fb-1 +* 0.111: Phase-2 HLT:75e33 * 0.201: HGCAL special TICL Pattern recognition Workflows: clue3D * 0.202: HGCAL special TICL Pattern recognition Workflows: FastJet * 0.9001: Sonic Triton diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 9057899ac6906..32267bba39a74 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3577,7 +3577,17 @@ def gen2021HiMix(fragment,howMuch): '--eventcontent':'FEVTDEBUGHLT', '--geometry' : geom } - + + upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:75e33', + '--processName':'HLTX', + '--conditions':gt, + '--datatier':'FEVTDEBUGHLT', + '-n':'10', + '--eventcontent':'FEVTDEBUGHLT', + '--geometry' : geom, + '--filein':'file:step3.root' + } + upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM', '--conditions':gt, '--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 05e0f65b24534..9fa3ce788fcd3 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -157,10 +157,13 @@ def setup_(self, step, stepName, stepDict, k, properties): cust=properties.get('Custom', None) era=properties.get('Era', None) modifier=properties.get('ProcessModifier',None) + geometry=properties.get('Geom',None) if cust is not None: stepDict[stepName][k]['--customise']=cust if era is not None: stepDict[stepName][k]['--era']=era if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier + if geometry == 'Extended2026D88' and step == 'HARVESTGlobal': + stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): return True upgradeWFs['baseline'] = UpgradeWorkflow_baseline( @@ -185,6 +188,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'ALCA', 'Nano', 'MiniAOD', + 'HLT75e33', ], PU = [ 'DigiTrigger', @@ -200,6 +204,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HARVESTGlobal', 'MiniAOD', 'Nano', + 'HLT75e33', ], suffix = '', offset = 0.0, @@ -1602,7 +1607,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'HLTmenu': '@fake2', 'GT' : 'auto:phase2_realistic_T21', 'Era' : 'Phase2C17I13M9', - 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'], + 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal','HLT75e33', 'HARVESTGlobal'], }, '2026D89' : { 'Geom' : 'Extended2026D89', @@ -1630,7 +1635,9 @@ def condition(self, fragment, stepList, key, hasHarvest): # standard PU sequences for key in list(upgradeProperties[2026].keys()): upgradeProperties[2026][key+'PU'] = deepcopy(upgradeProperties[2026][key]) - upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU', 'HARVESTGlobalPU'] + upgradeProperties[2026][key+'PU']['ScenToRun'] = ['GenSimHLBeamSpot','DigiTriggerPU','RecoGlobalPU'] + \ + (['HLT75e33'] if 'HLT75e33' in upgradeProperties[2026][key]['ScenToRun'] else []) + \ + ['HARVESTGlobalPU'] # for relvals defaultDataSets = {}