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.

Sign up for GitHub

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

consistent implementation of nano step for Run 3 #36167

Merged
merged 3 commits into from
Nov 29, 2021
Merged

consistent implementation of nano step for Run 3 #36167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8567468
consistent implementation of nano step for Run 3
kpedro88 Nov 9, 2021
7f14675
add 2021 ttbar pu prodlike to regular matrix
kpedro88 Nov 19, 2021
469b45f
retain any other eras in DDD workflow
kpedro88 Nov 22, 2021
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
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
# (Patatrack HCAL-only: TTbar - on CPU)
# (TTbar 0T, TTbar PU 0T)
# (TTbar PU MLPF)
# (TTbar PU prod-like)
# (QCD 1.8TeV DeepCore)
# 2023 (TTbar, TTbar PU, TTbar PU premix)
# 2024 (TTbar, TTbar PU, TTbar PU premix)
Expand Down Expand Up @@ -66,6 +67,7 @@
11634.521,
11634.24,11834.24,
11834.13,
11834.21,
11723.17,
12434.0,12634.0,12634.99,
12834.0,13034.0,13034.99,]
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3495,7 +3495,7 @@ def gen2021HiMix(fragment,howMuch):
'--filetype':'DQM',
}

upgradeStepDict['HARVESTRecNan'][k]={'-s':'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
upgradeStepDict['HARVESTNano'][k]={'-s':'HARVESTING:@standardValidation+@standardDQM+@ExtraHLT+@miniAODValidation+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--mc':'',
'--geometry' : geom,
Expand Down Expand Up @@ -3546,7 +3546,7 @@ def gen2021HiMix(fragment,howMuch):
'--geometry' : geom
}

upgradeStepDict['RecNan'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM',
upgradeStepDict['RecoNano'][k] = {'-s':'RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,NANO,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM+@nanoAODDQM',
'--conditions':gt,
'--datatier':'GEN-SIM-RECO,MINIAODSIM,NANOAODSIM,DQMIO',
'-n':'10',
Expand Down
10 changes: 3 additions & 7 deletions Configuration/PyReleaseValidation/python/relval_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ def makeStepName(key,frag,step,suffix):
# hack to add an extra step
if 'ProdLike' in specialType:
if 'Reco' in step: # handles both Reco and RecoGlobal
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','MiniAOD').replace('Reco','MiniAOD'),specialWF.suffix))
stepList[specialType].append(stepMaker(key,frag[:-4],step.replace('RecoGlobal','Nano').replace('Reco','Nano'),specialWF.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))
# similar hacks for premixing
if 'PMX' in specialType:
if 'GenSim' in step:
Expand All @@ -60,11 +61,6 @@ def makeStepName(key,frag,step,suffix):
else: stepList[specialType][-1] = stepMade
else:
stepList[specialType].append(stepMaker(key,frag[:-4],step,''))

if specialType in ['baseline']:
for ist, st in enumerate(stepList[specialType]):
if st.split('_')[0] == 'Reco': stepList[specialType][ist] = st.replace('Reco', 'RecNan')
elif st.split('_')[0] == 'HARVEST': stepList[specialType][ist] = st.replace('HARVEST', 'HARVESTRecNan')

for specialType,specialWF in upgradeWFs.items():
# remove other steps for premixS1
Expand Down
73 changes: 57 additions & 16 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
if cust is not None: stepDict[stepName][k]['--customise']=cust
if era is not None:
stepDict[stepName][k]['--era']=era
if 'RecNan' in stepName: stepDict[stepName][k]['--era'] += ',run3_nanoAOD_devel'
if 'RecoNano' in stepName: stepDict[stepName][k]['--era'] += ',run3_nanoAOD_devel'
if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier
def condition(self, fragment, stepList, key, hasHarvest):
return True
Expand All @@ -168,16 +168,16 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Reco',
'RecoFakeHLT',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTFakeHLT',
'HARVESTRecNan',
'HARVESTNano',
'FastSim',
'HARVESTFast',
'HARVESTGlobal',
'ALCA',
'Nano',
'MiniAOD',
'RecNan',
],
PU = [
'DigiTrigger',
Expand All @@ -186,13 +186,13 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Digi',
'Reco',
'RecoFakeHLT',
'RecoNano',
'HARVEST',
'HARVESTFakeHLT',
'HARVESTRecNan',
'HARVESTNano',
'HARVESTGlobal',
'MiniAOD',
'Nano',
'RecNan',
],
suffix = '',
offset = 0.0,
Expand Down Expand Up @@ -221,6 +221,8 @@ def setup_(self, step, stepName, stepDict, k, properties):
'HARVEST',
'RecoGlobal',
'HARVESTGlobal',
'RecoNano',
'HARVESTNano',
],
PU = [],
suffix = '_trackingOnly',
Expand Down Expand Up @@ -294,6 +296,8 @@ def condition_(self, fragment, stepList, key, hasHarvest):
'HARVEST',
'RecoGlobal',
'HARVESTGlobal',
'RecoNano',
'HARVESTNano',
],
PU = [],
suffix = '_pixelTrackingOnly',
Expand All @@ -317,6 +321,7 @@ def condition_(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
],
PU = [],
suffix = '_trackingMkFit',
Expand Down Expand Up @@ -347,6 +352,8 @@ def condition(self, fragment, stepList, key, hasHarvest):
'HARVEST',
'RecoGlobal',
'HARVESTGlobal',
'RecoNano',
'HARVESTNano',
],
PU = [],
suffix = '_seedingDeepCore',
Expand Down Expand Up @@ -382,9 +389,11 @@ def condition(self, fragment, stepList, key, hasHarvest):
upgradeWFs['trackdnn'] = UpgradeWorkflow_trackdnn(
steps = [
'Reco',
'RecoNano',
],
PU = [
'Reco',
'RecoNano',
],
suffix = '_trackdnn',
offset = 0.91,
Expand All @@ -402,16 +411,18 @@ def condition(self, fragment, stepList, key, hasHarvest):
upgradeWFs['mlpf'] = UpgradeWorkflow_mlpf(
steps = [
'Reco',
'RecoNano',
],
PU = [
'Reco',
'RecoNano',
],
suffix = '_mlpf',
offset = 0.13,
)
upgradeWFs['mlpf'].step3 = {
'--datatier': 'GEN-SIM-RECO,RECOSIM,MINIAODSIM,DQMIO',
'--eventcontent': 'FEVTDEBUGHLT,RECOSIM,MINIAODSIM,DQM',
'--datatier': 'GEN-SIM-RECO,RECOSIM,MINIAODSIM,NANOAODSIM,DQMIO',
'--eventcontent': 'FEVTDEBUGHLT,RECOSIM,MINIAODSIM,NANOEDMAODSIM,DQM',
'--procModifiers': 'mlpf'
}

Expand All @@ -433,6 +444,8 @@ def __init__(self, digi = {}, reco = {}, harvest = {}, **kwargs):
'HARVESTFakeHLT',
'RecoGlobal',
'HARVESTGlobal',
'RecoNano',
'HARVESTNano',
],
PU = [],
**kwargs)
Expand Down Expand Up @@ -736,10 +749,10 @@ def setup_(self, step, stepName, stepDict, k, properties):
elif 'MiniAOD' in step:
# the separate miniAOD step is used here
stepDict[stepName][k] = deepcopy(stepDict[step][k])
if 'ALCA' in step or 'HARVEST' in step:
elif 'ALCA' in step or 'HARVEST' in step:
# remove step
stepDict[stepName][k] = None
if 'Nano' in step:
elif 'Nano' in step:
stepDict[stepName][k] = merge([{'--filein':'file:step4.root','-s':'NANO','--datatier':'NANOAODSIM','--eventcontent':'NANOEDMAODSIM'}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return fragment=="TTbar_14TeV" and ('2026' in key or '2021' in key)
Expand All @@ -750,8 +763,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'MiniAOD',
'ALCA',
'Nano',
Expand All @@ -762,8 +777,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'MiniAOD',
'ALCA',
'Nano',
Expand Down Expand Up @@ -863,12 +880,16 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Digi',
'Reco',
'HARVEST',
'RecoNano',
'HARVESTNano',
'ALCA',
],
PU = [
'Digi',
'Reco',
'HARVEST',
'RecoNano',
'HARVESTNano',
],
suffix = '_0T',
offset = 0.24,
Expand Down Expand Up @@ -1040,6 +1061,7 @@ def workflow_(self, workflows, num, fragment, stepList, key):
'RecoLocal',
'Reco',
'RecoGlobal',
'RecoNano',
'Nano',
],
suffix = '_PMXS2',
Expand All @@ -1057,6 +1079,7 @@ def workflow_(self, workflows, num, fragment, stepList, key):
'RecoLocal',
'Reco',
'RecoGlobal',
'RecoNano',
'Nano',
],
suffix = '_PMXS1S2',
Expand Down Expand Up @@ -1123,9 +1146,11 @@ def condition(self, fragment, stepList, key, hasHarvest):
'RecoLocal',
'Reco',
'RecoGlobal',
'RecoNano',
'Nano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'MiniAOD',
'ALCA',
],
Expand All @@ -1144,9 +1169,11 @@ def condition(self, fragment, stepList, key, hasHarvest):
'RecoLocal',
'Reco',
'RecoGlobal',
'RecoNano',
'Nano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'MiniAOD',
'ALCA',
],
Expand All @@ -1173,8 +1200,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'ALCA',
],
PU = [],
Expand All @@ -1200,8 +1229,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'ALCA',
],
PU = [],
Expand All @@ -1213,7 +1244,11 @@ def condition(self, fragment, stepList, key, hasHarvest):
class UpgradeWorkflow_DDDDB(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Run3' in stepDict[step][k]['--era']:
stepDict[stepName][k] = merge([{'--conditions': 'auto:phase1_2021_realistic_ddd', '--geometry': 'DB:Extended', '--era': 'Run3_DDD'}, stepDict[step][k]])
# retain any other eras
tmp_eras = stepDict[step][k]['--era'].split(',')
tmp_eras[tmp_eras.index("Run3")] = 'Run3_DDD'
tmp_eras = ','.join(tmp_eras)
stepDict[stepName][k] = merge([{'--conditions': 'auto:phase1_2021_realistic_ddd', '--geometry': 'DB:Extended', '--era': tmp_eras}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return '2021' in key
upgradeWFs['DDDDB'] = UpgradeWorkflow_DDDDB(
Expand All @@ -1225,8 +1260,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'ALCA',
],
PU = [],
Expand All @@ -1250,8 +1287,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'ALCA',
],
PU = [
Expand All @@ -1262,8 +1301,10 @@ def condition(self, fragment, stepList, key, hasHarvest):
'DigiTrigger',
'Reco',
'RecoGlobal',
'RecoNano',
'HARVEST',
'HARVESTGlobal',
'HARVESTNano',
'ALCA',
],
suffix = '_SonicTriton',
Expand Down Expand Up @@ -1317,40 +1358,40 @@ def condition(self, fragment, stepList, key, hasHarvest):
'HLTmenu': '@relval2021',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'ScenToRun' : ['GenSim','Digi','Reco','HARVEST','ALCA'],
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2021Design' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2021_design',
'HLTmenu': '@relval2021',
'Era' : 'Run3',
'BeamSpot': 'GaussSigmaZ4cm',
'ScenToRun' : ['GenSim','Digi','Reco','HARVEST'],
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano'],
},
'2023' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2021',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'ScenToRun' : ['GenSim','Digi','Reco','HARVEST','ALCA'],
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2024' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2024_realistic',
'HLTmenu': '@relval2021',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'ScenToRun' : ['GenSim','Digi','Reco','HARVEST','ALCA'],
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
}

# standard PU sequences
for key in list(upgradeProperties[2017].keys()):
upgradeProperties[2017][key+'PU'] = deepcopy(upgradeProperties[2017][key])
upgradeProperties[2017][key+'PU']['ScenToRun'] = ['GenSim','DigiPU'] + \
(['RecoPU','HARVESTPU'] if '202' in key else ['RecoFakeHLTPU','HARVESTFakeHLTPU']) + \
(['Nano'] if 'Design' not in key else [])
(['RecoNanoPU','HARVESTNanoPU'] if '202' in key else ['RecoFakeHLTPU','HARVESTFakeHLTPU']) + \
(['Nano'] if 'Nano' in upgradeProperties[2017][key]['ScenToRun'] else [])

upgradeProperties[2026] = {
'2026D49' : {
Expand Down