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-43077: Convert all tasks to use CalibrateImageTask outputs #979

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Next Next commit
Switch to calibrateImage outputs
  • Loading branch information
parejkoj authored and TallJimbo committed Oct 10, 2024
commit d9a5dfec7aa6ab66ed6326bb6f4bc340d8e624fe
6 changes: 3 additions & 3 deletions python/lsst/pipe/tasks/finalizeCharacterization.py
Original file line number Diff line number Diff line change
@@ -48,20 +48,20 @@ class FinalizeCharacterizationConnections(pipeBase.PipelineTaskConnections,
defaultTemplates={}):
src_schema = pipeBase.connectionTypes.InitInput(
doc='Input schema used for src catalogs.',
name='src_schema',
name='initial_stars_schema',
storageClass='SourceCatalog',
)
srcs = pipeBase.connectionTypes.Input(
doc='Source catalogs for the visit',
name='src',
name='initial_stars_footprints_detector',
storageClass='SourceCatalog',
dimensions=('instrument', 'visit', 'detector'),
deferLoad=True,
multiple=True,
)
calexps = pipeBase.connectionTypes.Input(
doc='Calexps for the visit',
name='calexp',
name='initial_pvi',
storageClass='ExposureF',
dimensions=('instrument', 'visit', 'detector'),
deferLoad=True,
8 changes: 4 additions & 4 deletions python/lsst/pipe/tasks/makeWarp.py
Original file line number Diff line number Diff line change
@@ -50,21 +50,21 @@ class MakeWarpConnections(pipeBase.PipelineTaskConnections,
"calexpType": ""}):
calExpList = connectionTypes.Input(
doc="Input exposures to be resampled and optionally PSF-matched onto a SkyMap projection/patch",
name="{calexpType}calexp",
name="{calexpType}initial_pvi",
storageClass="ExposureF",
dimensions=("instrument", "visit", "detector"),
multiple=True,
deferLoad=True,
)
backgroundList = connectionTypes.Input(
doc="Input backgrounds to be added back into the calexp if bgSubtracted=False",
name="calexpBackground",
doc="Input backgrounds to be added back into the exposure if bgSubtracted=False",
name="initial_pvi_background",
storageClass="Background",
dimensions=("instrument", "visit", "detector"),
multiple=True,
)
skyCorrList = connectionTypes.Input(
doc="Input Sky Correction to be subtracted from the calexp if doApplySkyCorr=True",
doc="Input Sky Correction to be subtracted from the exposure if doApplySkyCorr=True",
name="skyCorr",
storageClass="Background",
dimensions=("instrument", "visit", "detector"),
4 changes: 2 additions & 2 deletions python/lsst/pipe/tasks/make_direct_warp.py
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ class MakeDirectWarpConnections(
calexp_list = Input(
doc="Input exposures to be interpolated and resampled onto a SkyMap "
"projection/patch.",
name="{calexpType}calexp",
name="{calexpType}initial_pvi",
storageClass="ExposureF",
dimensions=("instrument", "visit", "detector"),
multiple=True,
@@ -87,7 +87,7 @@ class MakeDirectWarpConnections(
background_revert_list = Input(
doc="Background to be reverted (i.e., added back to the calexp). "
"This connection is used only if doRevertOldBackground=False.",
name="calexpBackground",
name="initial_pvi_background",
storageClass="Background",
dimensions=("instrument", "visit", "detector"),
multiple=True,
4 changes: 2 additions & 2 deletions python/lsst/pipe/tasks/metrics.py
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ class NumberDeblendedSourcesMetricConnections(
):
sources = connectionTypes.Input(
doc="The catalog of science sources.",
name="src",
name="initial_stars_footprints_detector",
storageClass="SourceCatalog",
dimensions={"instrument", "visit", "detector"},
)
@@ -120,7 +120,7 @@ class NumberDeblendChildSourcesMetricConnections(
):
sources = connectionTypes.Input(
doc="The catalog of science sources.",
name="src",
name="initial_stars_footprints_detector",
storageClass="SourceCatalog",
dimensions={"instrument", "visit", "detector"},
)
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/multiBand.py
Original file line number Diff line number Diff line change
@@ -260,7 +260,7 @@ class MeasureMergedCoaddSourcesConnections(PipelineTaskConnections,
doc="Source catalogs for visits which overlap input tract, patch, band. Will be "
"further filtered in the task for the purpose of propagating flags from image calibration "
"and characterization to coadd objects. Only used in legacy PropagateVisitFlagsTask.",
name="src",
name="initial_stars_footprints_detector",
dimensions=("instrument", "visit", "detector"),
storageClass="SourceCatalog",
multiple=True
10 changes: 5 additions & 5 deletions python/lsst/pipe/tasks/postprocess.py
Original file line number Diff line number Diff line change
@@ -194,14 +194,14 @@ class WriteSourceTableConnections(pipeBase.PipelineTaskConnections,

catalog = connectionTypes.Input(
doc="Input full-depth catalog of sources produced by CalibrateTask",
name="{catalogType}src",
name="{catalogType}initial_stars_footprints_detector",
storageClass="SourceCatalog",
dimensions=("instrument", "visit", "detector")
)
outputCatalog = connectionTypes.Output(
doc="Catalog of sources, `src` in DataFrame/Parquet format. The 'id' column is "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Legacy usage of src in this doc string.

"replaced with an index; all other columns are unchanged.",
name="{catalogType}source",
name="{catalogType}initial_stars_detector",
storageClass="DataFrame",
dimensions=("instrument", "visit", "detector")
)
@@ -959,8 +959,8 @@ class TransformSourceTableConnections(pipeBase.PipelineTaskConnections,
dimensions=("instrument", "visit", "detector")):

inputCatalog = connectionTypes.Input(
doc="Wide input catalog of sources produced by WriteSourceTableTask",
name="{catalogType}source",
doc="Wide input catalog of sources produced by WriteSourceTableTask or CalibrateImage.",
name="{catalogType}sources_detector",
storageClass="DataFrame",
dimensions=("instrument", "visit", "detector"),
deferLoad=True
@@ -996,7 +996,7 @@ class ConsolidateVisitSummaryConnections(pipeBase.PipelineTaskConnections,
defaultTemplates={"calexpType": ""}):
calexp = connectionTypes.Input(
doc="Processed exposures used for metadata",
name="calexp",
name="initial_pvi",
storageClass="ExposureF",
dimensions=("instrument", "visit", "detector"),
deferLoad=True,
4 changes: 2 additions & 2 deletions python/lsst/pipe/tasks/skyCorrection.py
Original file line number Diff line number Diff line change
@@ -109,15 +109,15 @@ class SkyCorrectionConnections(PipelineTaskConnections, dimensions=("instrument"
)
calExps = cT.Input(
doc="Background-subtracted calibrated exposures.",
name="calexp",
name="initial_pvi",
multiple=True,
storageClass="ExposureF",
dimensions=["instrument", "visit", "detector"],
)
calBkgs = cT.Input(
doc="Subtracted backgrounds for input calibrated exposures.",
multiple=True,
name="calexpBackground",
name="initial_pvi_background",
storageClass="Background",
dimensions=["instrument", "visit", "detector"],
)