Switch to shapeHsm from SdssShape

shapeHsm handles negative sources better than SdssShape, otherwise they're similar enough that there's no benefit here to running both.
lsst · May 20, 2024 · 9ec28d1 · 9ec28d1
1 parent 4934cbc
commit 9ec28d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/python/lsst/ip/diffim/detectAndMeasure.py b/python/lsst/ip/diffim/detectAndMeasure.py
@@ -29,7 +29,6 @@
 from lsst.meas.base import ForcedMeasurementTask, ApplyApCorrTask, DetectorVisitIdGeneratorConfig
 import lsst.meas.deblender
 import lsst.meas.extensions.trailedSources  # noqa: F401
-import lsst.meas.extensions.shapeHSM
 import lsst.pex.config as pexConfig
 from lsst.pex.exceptions import InvalidParameterError
 import lsst.pipe.base as pipeBase
@@ -205,11 +204,7 @@ def setDefaults(self):
         self.measurement.plugins.names |= ["ext_trailedSources_Naive",
                                            "base_LocalPhotoCalib",
                                            "base_LocalWcs",
-                                           "ext_shapeHSM_HsmSourceMoments",
-                                           "ext_shapeHSM_HsmPsfMoments",
                                            ]
-        self.measurement.slots.psfShape = "ext_shapeHSM_HsmPsfMoments"
-        self.measurement.slots.shape = "ext_shapeHSM_HsmSourceMoments"
         self.measurement.plugins["base_SdssCentroid"].maxDistToPeak = 5.0
         self.forcedMeasurement.plugins = ["base_TransformedCentroid", "base_PsfFlux"]
         self.forcedMeasurement.copyColumns = {

diff --git a/python/lsst/ip/diffim/dipoleFitTask.py b/python/lsst/ip/diffim/dipoleFitTask.py
@@ -26,6 +26,7 @@
 
 import lsst.afw.image as afwImage
 import lsst.meas.base as measBase
+import lsst.meas.extensions.shapeHSM  # noqa: F401
 import lsst.afw.detection as afwDet
 import lsst.geom as geom
 import lsst.pex.exceptions as pexExcept
@@ -109,15 +110,17 @@ def setDefaults(self):
                               "base_PixelFlags",
                               "base_SkyCoord",
                               "base_PsfFlux",
-                              "base_SdssShape",
+                              "ext_shapeHSM_HsmSourceMoments",
+                              "ext_shapeHSM_HsmPsfMoments",
                               ]
+        self.slots.psfShape = "ext_shapeHSM_HsmPsfMoments"
+        self.slots.shape = "ext_shapeHSM_HsmSourceMoments"
         # Only measure the apertures we need to report in the alert stream.
         self.plugins["base_CircularApertureFlux"].radii = [12.0]
 
         self.slots.calibFlux = None
         self.slots.modelFlux = None
         self.slots.gaussianFlux = None
-        self.slots.shape = "base_SdssShape"
         # This will be switched to "ip_diffim_DipoleFit" as this task runs.
         self.slots.centroid = "base_SdssCentroid"
         self.doReplaceWithNoise = False