Merge pull request #32 from lsst/tickets/DM-40463

DM-40463: Fix the failing test on macOS Ventura 13.5
lsst · Aug 23, 2023 · 8dd6597 · 8dd6597
2 parents 96f6979 + 8c15dde
commit 8dd6597
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 47 deletions.
diff --git a/doc/lsst.meas.extensions.gaap/index.rst b/doc/lsst.meas.extensions.gaap/index.rst
@@ -31,47 +31,6 @@ You can find Jira issues for this module under the `meas_extensions_gaap <https:
 .. .. toctree::
 ..    :maxdepth: 1
 
-.. _lsst.meas.extensions.gaap-command-line-taskref:
-
-Task reference
-==============
-
-.. _lsst.meas.extensions.gaap-pipeline-tasks:
-
-Pipeline tasks
---------------
-
-.. lsst-pipelinetasks::
-   :root: lsst.meas.extensions.gaap
-
-.. _lsst.meas.extensions.gaap-tasks:
-
-Tasks
------
-
-.. lsst-tasks::
-   :root: lsst.meas.extensions.gaap
-   :toctree: tasks
-
-.. _lsst.meas.extensions.gaap-configs:
-
-Configurations
---------------
-
-.. lsst-configs::
-   :root: lsst.meas.extensions.gaap
-   :toctree: configs
-
-.. .. _lsst.meas.extensions.gaap-scripts:
-
-.. Script reference
-.. ================
-
-.. .. TODO: Add an item to this toctree for each script reference topic in the scripts subdirectory.
-
-.. .. toctree::
-..    :maxdepth: 1
-
 .. .. _lsst.meas.extensions.gaap-pyapi:
 
 Python API reference

diff --git a/tests/test_gaap.py b/tests/test_gaap.py
@@ -359,13 +359,22 @@ def testFlags(self, sigmas=[0.4, 0.5, 0.7], scalingFactors=[1.15, 1.25, 1.4, 100
         for scalingFactor, sigma in itertools.product(gaapConfig.scalingFactors, gaapConfig.sigmas):
             targetSigma = scalingFactor*seeing
             baseName = gaapConfig._getGaapResultName(scalingFactor, sigma, algName)
-            # Give some leeway for the edge case.
-            if targetSigma - sigma/pixelScale >= -1e-10:
-                self.assertTrue(record[baseName+"_flag_bigPsf"])
-                self.assertTrue(record[baseName+"_flag"])
+            # Give some leeway for the edge case and compare against a small
+            # negative number instead of zero.
+            if targetSigma*pixelScale - sigma >= -2e-7:
+                self.assertTrue(record[baseName+"_flag_bigPsf"],
+                                msg=f"bigPsf flag not set for {scalingFactor=} and {sigma=}",
+                                )
+                self.assertTrue(record[baseName+"_flag"],
+                                msg=f"Flag not set for {scalingFactor=} and {sigma=}",
+                                )
             else:
-                self.assertFalse(record[baseName+"_flag_bigPsf"])
-                self.assertFalse(record[baseName+"_flag"])
+                self.assertFalse(record[baseName+"_flag_bigPsf"],
+                                 msg=f"bigPsf flag set for {scalingFactor=} and {sigma=}",
+                                 )
+                self.assertFalse(record[baseName+"_flag"],
+                                 msg=f"Flag set for {scalingFactor=} and {sigma=}",
+                                 )
 
         # Ensure that flag_bigPsf is set if OptimalShape is not large enough.
         if gaapConfig.doOptimalPhotometry: