diff --git a/pipelines/coaddDiffMatchedQualityExtended.yaml b/pipelines/coaddDiffMatchedQualityExtended.yaml index 2b08323ba..efb5e936b 100644 --- a/pipelines/coaddDiffMatchedQualityExtended.yaml +++ b/pipelines/coaddDiffMatchedQualityExtended.yaml @@ -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 @@ -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 diff --git a/python/lsst/analysis/tools/actions/vector/selectors.py b/python/lsst/analysis/tools/actions/vector/selectors.py index ad33415ac..b03b7ef8a 100644 --- a/python/lsst/analysis/tools/actions/vector/selectors.py +++ b/python/lsst/analysis/tools/actions/vector/selectors.py @@ -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"] @@ -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"] diff --git a/python/lsst/analysis/tools/atools/genericBuild.py b/python/lsst/analysis/tools/atools/genericBuild.py index d897686dd..2ba420e9d 100644 --- a/python/lsst/analysis/tools/atools/genericBuild.py +++ b/python/lsst/analysis/tools/atools/genericBuild.py @@ -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") @@ -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", diff --git a/python/lsst/analysis/tools/tasks/catalogMatch.py b/python/lsst/analysis/tools/tasks/catalogMatch.py index 3c7de49c0..32e5d8d44 100644 --- a/python/lsst/analysis/tools/tasks/catalogMatch.py +++ b/python/lsst/analysis/tools/tasks/catalogMatch.py @@ -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]( diff --git a/tests/test_actions.py b/tests/test_actions.py index bef844685..53f8f7ca5 100644 --- a/tests/test_actions.py +++ b/tests/test_actions.py @@ -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], @@ -553,7 +553,7 @@ def testCoaddPlotFlagSelector(self): "{band}_pixelFlags_saturatedCenter", "{band}_extendedness_flag", "sky_object", - "xy_flag", + "coord_flag", "detect_isPatchInner", "detect_isDeblendedSource", ] diff --git a/tests/test_catalogMatch.py b/tests/test_catalogMatch.py index 118614024..cded78e45 100644 --- a/tests/test_catalogMatch.py +++ b/tests/test_catalogMatch.py @@ -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",