Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HLT75e33 step to Phase-2 workflows #37324

Merged
merged 4 commits into from
Apr 20, 2022
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
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ The offsets currently in use are:
* 0.21: Production-like sequence
* 0.24: 0 Tesla (Run-2, Run-3)
* 0.61: `phase2_ecal_devel` era
* 0.75: Phase-2 HLT
* 0.91: Track DNN modifier
* 0.97: Premixing stage1
* 0.98: Premixing stage2
Expand Down
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/python/relval_2026.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
numWFIB.extend([38634.0]) #2026D86
numWFIB.extend([39034.0]) #2026D87
numWFIB.extend([39434.0,39434.911,39434.103]) #2026D88 DDD XML, DD4hep XML, aging
numWFIB.extend([39434.75]) #2026D88 with HLT75e33
numWFIB.extend([39661.97]) #2026D88 premixing stage1 (NuGun+PU)
numWFIB.extend([39434.5,39434.9,39434.501,39434.502]) #2026D88 pixelTrackingOnly, vector hits, Patatrack local reconstruction on CPU, Patatrack local reconstruction on GPU
numWFIB.extend([39634.99,39634.999]) #2026D88 premixing combined stage1+stage2 (ttbar+PU200, ttbar+PU50 for PR test)
Expand Down
11 changes: 10 additions & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -3594,7 +3594,16 @@ def gen2021HiMix(fragment,howMuch):
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}


upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:@relval2026',
'--processName':'HLTX',
'--conditions':gt,
'--datatier':'FEVT',
'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}

upgradeStepDict['Reco'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
Expand Down
4 changes: 4 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ def makeStepName(key,frag,step,suffix):
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('RecoNano','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
if 'RecoNano' in step:
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoNano','Nano'),specialWF.suffix))
# hack to add extra HLT75e33 step for Phase-2
if 'HLT75e33' in specialType:
if 'RecoGlobal' in step:
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','HLT75e33'),specialWF.suffix))
# similar hacks for premixing
if 'PMX' in specialType:
if 'GenSim' in step:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'ALCA',
'Nano',
'MiniAOD',
'HLT75e33',
],
PU = [
'DigiTrigger',
Expand All @@ -200,6 +201,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'HARVESTGlobal',
'MiniAOD',
'Nano',
'HLT75e33',
],
suffix = '',
offset = 0.0,
Expand Down Expand Up @@ -1192,6 +1194,33 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.21,
)

class UpgradeWorkflow_HLT75e33(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'HARVEST' in step:
stepDict[stepName][k] = merge([{'--filein':'file:step3_inDQM.root'}, stepDict[step][k]])
else:
stepDict[stepName][k] = merge([stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return fragment=="TTbar_14TeV" and '2026' in key
upgradeWFs['HLT75e33'] = UpgradeWorkflow_HLT75e33(
steps = [
'GenSimHLBeamSpot14',
'DigiTrigger',
'RecoGlobal',
'HLT75e33',
'HARVESTGlobal',
],
PU = [
'GenSimHLBeamSpot14',
'DigiTrigger',
'RecoGlobal',
'HLT75e33',
'HARVESTGlobal',
],
suffix = '_HLT75e33',
offset = 0.75,
)

class UpgradeWorkflow_Neutron(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'GenSim' in step:
Expand Down
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/scripts/runTheMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def runSelected(opt):
28234.0, #2026D60 (exercise HF nose)
35034.0, #2026D77 ttbar
39434.0, #2026D88 ttbar (2022 new baseline)
39434.75, #2026D88 ttbar with HLT75e33
#39434.911, #2026D88 ttbar DD4hep XML
39634.999, #2026D88 ttbar premixing stage1+stage2, PU50
39496.0, #CE_E_Front_120um D88
Expand Down