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

Jump to bottom

Add wfs with HLT as separate step (refactor) #37633

Merged
merged 8 commits into from Apr 22, 2022
Merged

Add wfs with HLT as separate step (refactor) #37633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43ac400
Merge pull request #16 from cms-sw/master
kskovpen Dec 3, 2021
0c7b484
Merge pull request #17 from cms-sw/master
kskovpen Dec 7, 2021
2fa8e6b
Merge branch 'cms-sw:master' into master
kskovpen Jan 24, 2022
5726847
Merge branch 'cms-sw:master' into master
kskovpen Apr 17, 2022
6aaf42b
Merge branch 'cms-sw:master' into master
kskovpen Apr 20, 2022
3356cd4
add test wf for separate hlt
kskovpen Apr 20, 2022
bf7c19a
add test wf for separate hlt
kskovpen Apr 20, 2022
d579a07
update
kskovpen Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Configuration/PyReleaseValidation/README.md
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@ The offsets currently in use are:
* 0.595: Patatrack, full reco with pixel triplets, on CPU
* 0.596: Patatrack, full reco with pixel triplets, with automatic offload to GPU if available
* 0.6: HE Collapse (old depth segmentation for 2018)
* 0.601: HLT as separate step
* 0.7: trackingMkFit modifier
* 0.8: BPH Parking (Run-2)
* 0.9: Vector hits
Expand Down
2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@
# (TTbar PU MLPF)
# (TTbar PU prod-like)
# (QCD 1.8TeV DeepCore)
# (TTbar DigiNoHLT)
# 2023 (TTbar, TTbar PU, TTbar PU premix)
# 2024 (TTbar, TTbar PU, TTbar PU premix)
numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
Expand Down Expand Up @@ -69,6 +70,7 @@
11834.13,
11834.21,
11723.17,
11634.601,
12434.0,12634.0,12634.99,
12834.0,13034.0,13034.99,]
for numWF in numWFIB:
Expand Down
9 changes: 9 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -3594,6 +3594,15 @@ def gen2021HiMix(fragment,howMuch):
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom
}

upgradeStepDict['HLTRun3'][k] = {'-s':'HLT:%s'%(hltversion),
'--conditions':gt,
'--datatier':'GEN-SIM-DIGI-RAW',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This datatier may cause the issue if workflow runs with stepchain, I think. It used to be an issue that stepchain can't handle same datatiers.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about referencing it as SIM-RAW?

'-n':'10',
'--eventcontent':'FEVTDEBUGHLT',
'--geometry' : geom,
'--outputCommands' : '"drop *_*_*_GEN,drop *_*_*_DIGI2RAW"'
}

upgradeStepDict['HLT75e33'][k] = {'-s':'HLT:@relval2026',
'--processName':'HLTX',
Expand Down
25 changes: 25 additions & 0 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Expand Up @@ -171,6 +171,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GenSimHLBeamSpotHGCALCloseBy',
'Digi',
'DigiTrigger',
'HLTRun3',
'RecoLocal',
'Reco',
'RecoFakeHLT',
Expand Down Expand Up @@ -207,6 +208,30 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.0,
)

class UpgradeWorkflow_DigiNoHLT(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if stepDict[step][k] != None:
if 'ALCA' in step:
stepDict[stepName][k] = None
if 'RecoNano' in step:
stepDict[stepName][k] = merge([{'--filein': 'file:step3.root', '--secondfilein': 'file:step2.root'}, stepDict[step][k]])
if 'Digi' in step:
stepDict[stepName][k] = merge([{'-s': re.sub(',HLT.*', '', stepDict[step][k]['-s'])}, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
if ('TTbar_14TeV' in fragment and '2021' == key):
stepList.insert(stepList.index('Digi_DigiNoHLT_2021')+1, 'HLTRun3_2021')
return ('TTbar_14TeV' in fragment and '2021' == key)
upgradeWFs['DigiNoHLT'] = UpgradeWorkflow_DigiNoHLT(
steps = [
'Digi',
'RecoNano',
'ALCA'
],
PU = [],
suffix = '_DigiNoHLT',
offset = 0.601,
)

# some commonalities among tracking WFs
class UpgradeWorkflowTracking(UpgradeWorkflow):
# skip the PU argument since PU workflows never used here
Expand Down