Merge pull request #841 from lsst/tickets/DM-40781-v25

DM-40781-v25: Add check for nans when computing grid psf quantities.
lsst · Oct 10, 2023 · 2ab1321 · 2ab1321
2 parents 91fc1fa + 3a4ce27
commit 2ab1321
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/python/lsst/pipe/tasks/background.py b/python/lsst/pipe/tasks/background.py
@@ -594,14 +594,14 @@ def __init__(self, config, dims, transform, values=None, numbers=None):
             values.set(0.0)
         else:
             values = values.clone()
-        assert(values.getDimensions() == self.dims)
+        assert values.getDimensions() == self.dims
         self._values = values
         if numbers is None:
             numbers = afwImage.ImageF(self.dims)  # float for dynamic range and convenience
             numbers.set(0.0)
         else:
             numbers = numbers.clone()
-        assert(numbers.getDimensions() == self.dims)
+        assert numbers.getDimensions() == self.dims
         self._numbers = numbers
 
     def __reduce__(self):

diff --git a/python/lsst/pipe/tasks/configurableActions/_configurableActionStructField.py b/python/lsst/pipe/tasks/configurableActions/_configurableActionStructField.py
@@ -161,7 +161,7 @@ def _config(self) -> Config:
         # Config Fields should never outlive their config class instance
         # assert that as such here
         value = self._config_()
-        assert(value is not None)
+        assert value is not None
         return value
 
     @property

diff --git a/python/lsst/pipe/tasks/configurableActions/tests.py b/python/lsst/pipe/tasks/configurableActions/tests.py
@@ -40,7 +40,7 @@ def __call__(self):
         return self.var
 
     def validate(self):
-        assert(self.var is not None)
+        assert self.var is not None
 
 
 class ActionTest2(ConfigurableAction):
@@ -50,7 +50,7 @@ def __call__(self):
         return self.var
 
     def validate(self):
-        assert(self.var is not None)
+        assert self.var is not None
 
 
 class ActionTest3(ConfigurableAction):
@@ -60,7 +60,7 @@ def __call__(self):
         return self.var
 
     def validate(self):
-        assert(self.var is not None)
+        assert self.var is not None
 
 
 class TestConfig(Config):

diff --git a/python/lsst/pipe/tasks/healSparseMappingProperties.py b/python/lsst/pipe/tasks/healSparseMappingProperties.py
@@ -165,13 +165,18 @@ def compute_approx_psf_size_and_shape(ccd_row, ra, dec, nx=20, ny=20, orderx=2,
                                               ("psf_e2", "f8"),
                                               ("psf_area", "f8")])
 
-    cheb_size = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_size, ctrl)
+    # Protect against nans which can come in at the edges and masked regions.
+    good = np.isfinite(psf_size)
+    x = x[good]
+    y = y[good]
+
+    cheb_size = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_size[good], ctrl)
     psf_array["psf_size"] = cheb_size.evaluate(pixel_x, pixel_y)
-    cheb_e1 = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_e1, ctrl)
+    cheb_e1 = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_e1[good], ctrl)
     psf_array["psf_e1"] = cheb_e1.evaluate(pixel_x, pixel_y)
-    cheb_e2 = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_e2, ctrl)
+    cheb_e2 = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_e2[good], ctrl)
     psf_array["psf_e2"] = cheb_e2.evaluate(pixel_x, pixel_y)
-    cheb_area = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_area, ctrl)
+    cheb_area = ChebyshevBoundedField.fit(lsst.geom.Box2I(bbox), x, y, psf_area[good], ctrl)
     psf_array["psf_area"] = cheb_area.evaluate(pixel_x, pixel_y)
 
     return psf_array