Skip to content

Commit

Permalink
Merge pull request #156 from lsst/tickets/DM-27222
Browse files Browse the repository at this point in the history
DM-27222: Update deduplicate argument to new form of findFirst
  • Loading branch information
timj committed Oct 22, 2020
2 parents e1cbb79 + d1efcac commit 8900aa8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions python/lsst/pipe/base/graphBuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ def resolveDatasetRefs(self, registry, collections, run, commonDataIds, *, skipE
).findDatasets(
datasetType,
collections=run,
deduplicate=True
findFirst=True
)
for resolvedRef in resolvedRefQueryResults:
# TODO: we could easily support per-DatasetType
Expand All @@ -638,7 +638,7 @@ def resolveDatasetRefs(self, registry, collections, run, commonDataIds, *, skipE
).findDatasets(
datasetType,
collections=collections,
deduplicate=True
findFirst=True
)
dataIdsNotFoundYet = set(refs.keys())
for resolvedRef in resolvedRefQueryResults:
Expand Down Expand Up @@ -733,7 +733,7 @@ def resolveDatasetRefs(self, registry, collections, run, commonDataIds, *, skipE
refs = list(registry.queryDatasets(datasetType,
collections=collections,
dataId=quantum.dataId,
deduplicate=True).expanded())
findFirst=True).expanded())
quantum.prerequisites[datasetType].update({ref.dataId: ref for ref in refs
if ref is not None})
# Actually remove any quanta that we decided to skip above.
Expand Down

0 comments on commit 8900aa8

Please sign in to comment.