Add default slot for PSF shape

python/lsst/meas/base/baseMeasurement.py

@@ -79,6 +79,8 @@ class SourceSlotConfig(lsst.pex.config.Config):
                                      doc="the name of the centroiding algorithm used to set source x,y")
     shape = lsst.pex.config.Field(dtype=str, default="base_SdssShape", optional=True,
                                   doc="the name of the algorithm used to set source moments parameters")
+    psfShape = lsst.pex.config.Field(dtype=str, default="base_SdssShape_psf", optional=True,
+                                     doc="the name of the algorithm used to set PSF moments parameters")
     apFlux = lsst.pex.config.Field(dtype=str, default="base_CircularApertureFlux_12_0", optional=True,
                                    doc="the name of the algorithm used to set the source aperture flux slot")
     modelFlux = lsst.pex.config.Field(dtype=str, default="base_GaussianFlux", optional=True,
@@ -101,6 +103,8 @@ def setupSchema(self, schema):
             aliases.set("slot_Centroid", self.centroid)
         if self.shape is not None:
             aliases.set("slot_Shape", self.shape)
+        if self.psfShape is not None:
+            aliases.set("slot_PsfShape", self.psfShape)
         if self.apFlux is not None:
             aliases.set("slot_ApFlux", self.apFlux)
         if self.modelFlux is not None:

tests/test_CentroidChecker.py

@@ -115,6 +115,7 @@ def makeConfig(self, algName=None):
         config.slots.modelFlux = None
         config.slots.psfFlux = None
         config.slots.shape = None
+        config.slots.psfShape = None
         return config
 
     def tearDown(self):

tests/test_FlagHandler.py

@@ -153,6 +153,7 @@ def setUp(self):
         config.slots.modelFlux = None
         config.slots.psfFlux = None
         config.slots.shape = None
+        config.slots.psfShape = None
         self.config = config
 
     def tearDown(self):

tests/test_ImportCentroidAlgorithm.py

@@ -100,6 +100,7 @@ def testMeasureCentroid(self):
         sfm_config.plugins["testLib_SillyCentroid"].param = 5
         sfm_config.slots.centroid = "testLib_SillyCentroid"
         sfm_config.slots.shape = None
+        sfm_config.slots.psfShape = None
         sfm_config.slots.psfFlux = None
         sfm_config.slots.instFlux = None
         sfm_config.slots.calibFlux = None

tests/test_InputUtilities.py

@@ -56,6 +56,7 @@ def testCentroidFlagAliases(self):
         config = self.makeSingleFrameMeasurementConfig("base_NaiveCentroid", ["base_SdssCentroid"])
         config.slots.centroid = "base_SdssCentroid"
         config.slots.shape = None
+        config.slots.psfShape = None
         task = self.makeSingleFrameMeasurementTask(config=config)
         # Test that the alias resolves to the correct field.
         self.assertEqual(task.schema.find("base_NaiveCentroid_flag_badInitialCentroid").key,
@@ -74,6 +75,7 @@ def testUnmetCentroidDependency(self):
                                                        ["base_SdssCentroid", "base_SdssShape"])
         config.slots.centroid = None
         config.slots.shape = "base_SdssShape"
+        config.slots.psfShape = "base_SdssShape_psf"
         with self.assertRaises(lsst.pex.exceptions.LogicError):
             self.makeSingleFrameMeasurementTask(config=config)
 
@@ -85,6 +87,7 @@ def testUnmetShapeDependency(self):
                                                        ["base_SdssCentroid", "base_SdssShape"])
         config.slots.centroid = "base_SdssCentroid"
         config.slots.shape = None
+        config.slots.psfShape = None
         with self.assertRaises(lsst.pex.exceptions.LogicError):
             self.makeSingleFrameMeasurementTask(config=config)
 

tests/test_PluginLogs.py

@@ -193,6 +193,7 @@ def setUp(self):
         config.slots.modelFlux = None
         config.slots.psfFlux = None
         config.slots.shape = None
+        config.slots.psfShape = None
         self.config = config
 
     def tearDown(self):

tests/test_Variance.py

@@ -105,6 +105,7 @@ def setUp(self):
         config.slots.instFlux = None
         config.slots.calibFlux = None
         config.slots.shape = "base_SdssShape"
+        config.slots.psfShape = None
         config.plugins["base_Variance"].mask = ["BAD", "SAT"]
 
         config.validate()

tests/test_centroid.py

@@ -136,6 +136,7 @@ def mySetup(self):
         msConfig.algorithms.names = ["base_SdssCentroid"]
         msConfig.slots.centroid = "base_SdssCentroid"
         msConfig.slots.shape = None
+        msConfig.slots.psfShape = None
         msConfig.slots.apFlux = None
         msConfig.slots.modelFlux = None
         msConfig.slots.psfFlux = None
@@ -213,6 +214,7 @@ def setUp(self):
         msConfig.plugins["base_GaussianCentroid"].doFootprintCheck = False
         msConfig.slots.centroid = "base_GaussianCentroid"
         msConfig.slots.shape = None
+        msConfig.slots.psfShape = None
         msConfig.slots.apFlux = None
         msConfig.slots.modelFlux = None
         msConfig.slots.psfFlux = None

tests/test_undeblended.py

@@ -71,6 +71,7 @@ def testUndeblendedMeasurement(self):
         slots = sfmConfig.slots
         slots.centroid = "centroid"
         slots.shape = None
+        slots.psfShape = None
         slots.apFlux = None
         slots.modelFlux = None
         slots.psfFlux = None