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.

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

DM-8000: Pass down butler and refObjLoader in multiBandDriver #12

Merged
merged 1 commit into from
Oct 19, 2016
Merged
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions python/lsst/pipe/drivers/multiBandDriver.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,24 @@ class MultiBandDriverTask(BatchPoolTask):
_DefaultName = "multiBandDriver"
RunnerClass = MultiBandDriverTaskRunner

def __init__(self, butler=None, schema=None, **kwargs):
def __init__(self, butler=None, schema=None, refObjLoader=None, **kwargs):
"""!
@param[in] butler: the butler can be used to retrieve schema or passed to the refObjLoader constructor
in case it is needed.
@param[in] schema: the schema of the source detection catalog used as input.
@param[in] refObjLoader: an instance of LoadReferenceObjectsTasks that supplies an external reference
catalog. May be None if the butler argument is provided or all steps requiring a reference
catalog are disabled.
"""
BatchPoolTask.__init__(self, **kwargs)
if schema is None:
assert butler is not None, "Butler not provided"
schema = butler.get(self.config.coaddName + "Coadd_det_schema", immediate=True).schema
self.butler = butler
self.makeSubtask("mergeCoaddDetections", schema=schema)
self.makeSubtask("measureCoaddSources", schema=afwTable.Schema(self.mergeCoaddDetections.schema),
peakSchema=afwTable.Schema(self.mergeCoaddDetections.merged.getPeakSchema()))
peakSchema=afwTable.Schema(self.mergeCoaddDetections.merged.getPeakSchema()),
refObjLoader=refObjLoader, butler=butler)
self.makeSubtask("mergeCoaddMeasurements", schema=afwTable.Schema(self.measureCoaddSources.schema))
self.makeSubtask("forcedPhotCoadd", refSchema=afwTable.Schema(self.mergeCoaddMeasurements.schema))

Expand Down