Skip to content

DM-52922: Implement RFC-1131 (remove x,y and large Gaap etc..) #437

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 8, 2025
Merged

DM-52922: Implement RFC-1131 (remove x,y and large Gaap etc..) #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7155bfe
Remove gaap3p0 from all atools
yalsayyad Oct 15, 2025
f7681be
Remove x/y and rename xy_flag to coord_flag
yalsayyad Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions pipelines/coaddDiffMatchedQualityExtended.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,34 +49,6 @@ tasks:
atools.matchedRefCModelMagChi.produce.plot.xLims: lims_mag_x
atools.matchedRefCModelMagChi.produce.plot.yLims: lims_mag_chi

atools.matchedRefPositionXDiff: MatchedRefCoaddDiffPositionTool
atools.matchedRefPositionXDiff.coord_meas: x
atools.matchedRefPositionXDiff.coord_ref: refcat_x
atools.matchedRefPositionXDiff.produce.plot.xLims: lims_mag_x
atools.matchedRefPositionXDiff.produce.plot.yLims: lims_pos_diff
atools.matchedRefPositionXDiff.scale_factor: parameters.scale_pixel

atools.matchedRefPositionXChi: MatchedRefCoaddDiffPositionTool
atools.matchedRefPositionXChi.coord_meas: x
atools.matchedRefPositionXChi.coord_ref: refcat_x
atools.matchedRefPositionXChi.produce.plot.xLims: lims_mag_x
atools.matchedRefPositionXChi.produce.plot.yLims: lims_pos_chi
atools.matchedRefPositionXChi.compute_chi: true

atools.matchedRefPositionYDiff: MatchedRefCoaddDiffPositionTool
atools.matchedRefPositionYDiff.coord_meas: y
atools.matchedRefPositionYDiff.coord_ref: refcat_y
atools.matchedRefPositionYDiff.produce.plot.xLims: lims_mag_x
atools.matchedRefPositionYDiff.produce.plot.yLims: lims_pos_diff
atools.matchedRefPositionYDiff.scale_factor: parameters.scale_pixel

atools.matchedRefPositionYChi: MatchedRefCoaddDiffPositionTool
atools.matchedRefPositionYChi.coord_meas: y
atools.matchedRefPositionYChi.coord_ref: refcat_y
atools.matchedRefPositionYChi.produce.plot.xLims: lims_mag_x
atools.matchedRefPositionYChi.produce.plot.yLims: lims_pos_chi
atools.matchedRefPositionYChi.compute_chi: true

atools.matchedRefPositionRaDiff: MatchedRefCoaddDiffPositionTool
atools.matchedRefPositionRaDiff.coord_meas: coord_ra
atools.matchedRefPositionRaDiff.coord_ref: refcat_ra
Expand Down Expand Up @@ -144,26 +116,6 @@ tasks:
atools.matchedRefGaap1p0MagChi.produce.plot.xLims: lims_mag_x
atools.matchedRefGaap1p0MagChi.produce.plot.yLims: lims_mag_chi

atools.matchedRefGaap3p0ColorDiff: MatchedRefCoaddDiffColorTool
atools.matchedRefGaap3p0ColorDiff.mag_y1: gaap3p0_err
atools.matchedRefGaap3p0ColorDiff.produce.plot.xLims: lims_mag_x
atools.matchedRefGaap3p0ColorDiff.produce.plot.yLims: lims_color_diff

atools.matchedRefGaap3p0ColorChi: MatchedRefCoaddChiColorTool
atools.matchedRefGaap3p0ColorChi.mag_y1: gaap3p0_err
atools.matchedRefGaap3p0ColorChi.produce.plot.xLims: lims_mag_x
atools.matchedRefGaap3p0ColorChi.produce.plot.yLims: lims_mag_chi

atools.matchedRefGaap3p0MagDiff: MatchedRefCoaddDiffMagTool
atools.matchedRefGaap3p0MagDiff.mag_y: gaap3p0_err
atools.matchedRefGaap3p0MagDiff.produce.plot.xLims: lims_mag_x
atools.matchedRefGaap3p0MagDiff.produce.plot.yLims: lims_mag_diff

atools.matchedRefGaap3p0MagChi: MatchedRefCoaddChiMagTool
atools.matchedRefGaap3p0MagChi.mag_y: gaap3p0_err
atools.matchedRefGaap3p0MagChi.produce.plot.xLims: lims_mag_x
atools.matchedRefGaap3p0MagChi.produce.plot.yLims: lims_mag_chi

atools.matchedRefSersicColorDiff: MatchedRefCoaddDiffColorTool
atools.matchedRefSersicColorDiff.mag_y1: sersic_err
atools.matchedRefSersicColorDiff.produce.plot.xLims: lims_mag_x
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/analysis/tools/actions/vector/selectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def refMatchContext(self):
"{band}_psfFlux_flag_target",
"{band}_pixelFlags_saturatedCenter_target",
"{band}_extendedness_flag_target",
"xy_flag_target",
"coord_flag_target",
]
self.selectWhenTrue = ["detect_isPatchInner_target", "detect_isDeblendedSource_target"]

Expand Down Expand Up @@ -180,7 +180,7 @@ def setDefaults(self):
"{band}_psfFlux_flag",
"{band}_pixelFlags_saturatedCenter",
"{band}_extendedness_flag",
"xy_flag",
"coord_flag",
"sky_object",
]
self.selectWhenTrue = ["detect_isPatchInner", "detect_isDeblendedSource"]
Expand Down
7 changes: 0 additions & 7 deletions python/lsst/analysis/tools/atools/genericBuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ class FluxesDefaultConfig(Config):
cmodel_err = ConfigField[FluxConfig](doc="CModel total magnitude with errors")
disk_err = ConfigField[FluxConfig](doc="Disk model magnitude with errors")
gaap1p0_err = ConfigField[FluxConfig](doc="Gaap 1.0 arcsec aperture magnitude with errors")
gaap3p0_err = ConfigField[FluxConfig](doc="Gaap 3.0 arcsec aperture magnitude with errors")
kron_err = ConfigField[FluxConfig](doc="Kron aperture magnitude with errors")
psf_err = ConfigField[FluxConfig](doc="PSF model magnitude with errors")
ref_matched = ConfigField[FluxConfig](doc="Reference catalog magnitude")
Expand Down Expand Up @@ -283,12 +282,6 @@ class MagnitudeTool(ObjectClassTool):
name_flux='GAaP 1.0"',
name_flux_short="gaap_1p0",
),
gaap3p0_err=FluxConfig(
key_flux="{band}_gaap3p0Flux",
key_flux_error="{band}_gaap3p0FluxErr",
name_flux='GAaP 3.0"',
name_flux_short="gaap_3p0",
),
kron_err=FluxConfig(
key_flux="{band}_kronFlux",
key_flux_error="{band}_kronFluxErr",
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/analysis/tools/tasks/catalogMatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class CatalogMatchConfig(pipeBase.PipelineTaskConfig, pipelineConnections=Catalo

extraColumns = pexConfig.ListField[str](
doc="Other catalog columns to persist to downstream tasks",
default=["x", "y", "patch", "ebv"],
default=["patch", "ebv"],
)

extraPerBandColumns = pexConfig.ListField[str](
Expand Down
4 changes: 2 additions & 2 deletions tests/test_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ def setUp(self):
"{band}_psfFlux_flag": [1],
"{band}_pixelFlags_saturatedCenter": [3],
"{band}_extendedness_flag": [5],
"xy_flag": [7],
"coord_flag": [7],
"i_pixelFlags_edge": [13],
"r_pixelFlags_edge": [15],
"i_pixelFlags_nodata": [14],
Expand Down Expand Up @@ -553,7 +553,7 @@ def testCoaddPlotFlagSelector(self):
"{band}_pixelFlags_saturatedCenter",
"{band}_extendedness_flag",
"sky_object",
"xy_flag",
"coord_flag",
"detect_isPatchInner",
"detect_isDeblendedSource",
]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_catalogMatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def _make_objectCat(self, starIds, starRas, starDecs):
"z_pixelFlags_saturatedCenter",
"i_psfFlux_flag",
"r_pixelFlags_saturatedCenter",
"xy_flag",
"coord_flag",
"r_extendedness",
"y_pixelFlags_saturatedCenter",
"i_extendedness_flag",
Expand Down
Loading