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-42157: Fix and refactor CoaddMultibandFitTask #894

Merged
merged 2 commits into from
Mar 13, 2024
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
10 changes: 7 additions & 3 deletions python/lsst/pipe/tasks/fit_coadd_multiband.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import lsst.pipe.base as pipeBase
import lsst.pipe.base.connectionTypes as cT

import astropy
import astropy.table
from abc import ABC, abstractmethod
from pydantic import Field
from pydantic.dataclasses import dataclass
Expand Down Expand Up @@ -276,8 +276,7 @@ def __init__(self, initInputs, **kwargs):
super().__init__(initInputs=initInputs, **kwargs)
self.makeSubtask("fit_coadd_multiband")

def runQuantum(self, butlerQC, inputRefs, outputRefs):
inputs = butlerQC.get(inputRefs)
def build_catexps(self, butlerQC, inputRefs, inputs) -> list[CatalogExposureInputs]:
id_tp = self.config.idGenerator.apply(butlerQC.quantum.dataId).catalog_id
# This is a roundabout way of ensuring all inputs get sorted and matched
input_refs_objs = [(getattr(inputRefs, key), inputs[key])
Expand Down Expand Up @@ -305,6 +304,11 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
dataId=dataId, id_tract_patch=id_tp,
)
catexps = [catexps[band] for band in self.config.get_band_sets()[0]]
return catexps

def runQuantum(self, butlerQC, inputRefs, outputRefs):
inputs = butlerQC.get(inputRefs)
catexps = self.build_catexps(butlerQC, inputRefs, inputs)
outputs = self.run(catexps=catexps, cat_ref=inputs['cat_ref'])
butlerQC.put(outputs, outputRefs)

Expand Down