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

Fix prodlike workflow to use DIGI instead of DIGI:pdigi_valid #33847

Merged
merged 3 commits into from May 31, 2021
Merged

Fix prodlike workflow to use DIGI instead of DIGI:pdigi_valid #33847

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c84e36f
Use DIGI instead of DIGI:pdigi_valid in prodlike wfs
May 26, 2021
7259b4d
update digitizer for HGCAL in production mode
May 29, 2021
d1a025c
fix string comparison
May 29, 2021
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
15 changes: 15 additions & 0 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Expand Up @@ -547,6 +547,8 @@ class UpgradeWorkflow_ProdLike(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'Digi' in step and 'Trigger' not in step:
stepDict[stepName][k] = merge([{'-s': 'DIGI,L1,DIGI2RAW,HLT:@relval2021', '--datatier':'GEN-SIM-DIGI-RAW', '--eventcontent':'RAWSIM'}, stepDict[step][k]])
elif 'DigiTrigger' in step: # for Phase-2
stepDict[stepName][k] = merge([{'-s': 'DIGI,L1TrackTrigger,L1,DIGI2RAW,HLT:@fake2'}, stepDict[step][k]])
elif 'Reco' in step:
stepDict[stepName][k] = merge([{'-s': 'RAW2DIGI,L1Reco,RECO,RECOSIM', '--datatier':'AODSIM', '--eventcontent':'AODSIM'}, stepDict[step][k]])
elif 'MiniAOD' in step:
Expand All @@ -562,6 +564,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
upgradeWFs['ProdLike'] = UpgradeWorkflow_ProdLike(
steps = [
'Digi',
'DigiTrigger',
'Reco',
'RecoGlobal',
'HARVEST',
Expand All @@ -572,6 +575,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
],
PU = [
'Digi',
'DigiTrigger',
'Reco',
'RecoGlobal',
'HARVEST',
Expand Down Expand Up @@ -906,6 +910,17 @@ def setup_(self, step, stepName, stepDict, k, properties):
# copy steps, then apply specializations
UpgradeWorkflowPremix.setup_(self, step, stepName, stepDict, k, properties)
UpgradeWorkflow_ProdLike.setup_(self, step, stepName, stepDict, k, properties)
#
if 'Digi' in step:
d = merge([stepDict[self.getStepName(step)][k]])
tmpsteps = []
for s in d["-s"].split(","):
if s == "DIGI:pdigi_valid" in s:
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this condition is correct

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm.. Could you please guide? I get -s DIGI,DATAMIX,L1TrackTrigger,L1,DIGI2RAW,HLT:@fake2 as expected.

Copy link
Contributor

Choose a reason for hiding this comment

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

Either if s == "DIGI:pdigi_valid" or if "DIGI:pdigi_valid" in s would potentially make sense. Right now, this is comparing a string to a bool at some point.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, Fixed.

tmpsteps.append("DIGI")
else:
tmpsteps.append(s)
d = merge([{"-s" : ",".join(tmpsteps)},d])
stepDict[stepName][k] = d
def condition(self, fragment, stepList, key, hasHarvest):
# use both conditions
return UpgradeWorkflowPremix.condition(self, fragment, stepList, key, hasHarvest) and UpgradeWorkflow_ProdLike.condition(self, fragment, stepList, key, hasHarvest)
Expand Down