Skip to content

Commit

Permalink
Modify ap_pipe call for association.
Browse files Browse the repository at this point in the history
Comment out diaForcedSourceTask for now.

Fix ticket number in TODO.
  • Loading branch information
morriscb committed Jun 7, 2019
1 parent 1054f17 commit 7feff2d
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions python/lsst/ap/pipe/ap_pipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,17 @@ def runAssociation(self, sensorRef):
catalog = sensorRef.get(diffType + "Diff_diaSrc")
diffim = sensorRef.get(diffType + "Diff_differenceExp")

dia_sources = self.diaSourceDpddifier.run(catalog, diffim)
dia_sources = self.diaSourceDpddifier.run(catalog,
diffim,
return_pandas=True)
result = self.associator.run(dia_sources, diffim, self.ppdb)
self.diaForcedSource.run(result.dia_objects,
sensorRef.get("ccdExposureId_bits"),
sensorRef.get("calexp"),
diffim)
# TODO: DM-19906
# Need to convert diaFourcedSource task to accept pandas.DataFrame
# as an input.
# self.diaForcedSource.run(result.dia_objects,
# sensorRef.get("ccdExposureId_bits"),
# sensorRef.get("calexp"),
# diffim)

return pipeBase.Struct(
l1Database=self.ppdb,
Expand Down

0 comments on commit 7feff2d

Please sign in to comment.