Skip to content

Commit

Permalink
Merge branch 'tickets/DM-31220'
Browse files Browse the repository at this point in the history
  • Loading branch information
kfindeisen committed Jul 27, 2021
2 parents a67d2c9 + eb6cb26 commit fc22491
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion python/lsst/ap/pipe/ap_pipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ def runAssociation(self, sensorRef):
diffIm=sensorRef.get(diffType + "Diff_differenceExp"),
exposure=sensorRef.get("calexp"),
warpedExposure=sensorRef.get(diffType + "Diff_warpedExp"),
ccdExposureIdBits=sensorRef.get("ccdExposureId_bits"))
ccdExposureIdBits=sensorRef.get("ccdExposureId_bits"),
band=diffIm.getFilterLabel().bandLabel,
)

# apdb_marker triggers metrics processing; let them try to read
# something even if association failed
Expand Down
8 changes: 4 additions & 4 deletions tests/test_appipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ def mockPatchSubtasks(self, task):
particular value, but have mocked methods that can be queried
for calls by ApPipeTask
"""
with patch.object(task, "ccdProcessor") as mockCcdProcessor, \
patch.object(task, "differencer") as mockDifferencer, \
patch.object(task, "transformDiaSrcCat") as mockTransform, \
patch.object(task, "diaPipe") as mockDiaPipe:
with patch.object(task, "ccdProcessor", autospec=True) as mockCcdProcessor, \
patch.object(task, "differencer", autospec=True) as mockDifferencer, \
patch.object(task, "transformDiaSrcCat", autospec=True) as mockTransform, \
patch.object(task, "diaPipe", autospec=True) as mockDiaPipe:
yield pipeBase.Struct(ccdProcessor=mockCcdProcessor,
differencer=mockDifferencer,
transformDiaSrcCat=mockTransform,
Expand Down

0 comments on commit fc22491

Please sign in to comment.