Use the pixel_value_valid function in a few more places

dirac-institute · Mar 1, 2024 · 3ec1179 · 3ec1179
1 parent 7a1ae0b
commit 3ec1179
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/kbmod/search/psi_phi_array_ds.h b/src/kbmod/search/psi_phi_array_ds.h
@@ -37,7 +37,7 @@ struct PsiPhi {
 
 // Helper utility functions.
 inline float encode_uint_scalar(float value, float min_val, float max_val, float scale) {
-    return (value == NO_DATA) ? 0 : (std::max(std::min(value, max_val), min_val) - min_val) / scale + 1.0;
+    return !pixel_value_valid(value) ? 0 : (std::max(std::min(value, max_val), min_val) - min_val) / scale + 1.0;
 }
 
 inline float decode_uint_scalar(float value, float min_val, float scale) {

diff --git a/src/kbmod/search/stack_search.cpp b/src/kbmod/search/stack_search.cpp
@@ -202,7 +202,7 @@ std::vector<float> StackSearch::extract_psi_or_phi_curve(Trajectory& trj, bool e
         PsiPhi psi_phi_val = psi_phi_array.read_psi_phi(i, pred_idx.i, pred_idx.j);
 
         float value = (extract_psi) ? psi_phi_val.psi : psi_phi_val.phi;
-        if (value != NO_DATA) {
+        if (pixel_value_valid(value)) {
             result[i] = value;
         }
     }

diff --git a/tests/test_psi_phi_array.py b/tests/test_psi_phi_array.py
@@ -105,6 +105,10 @@ def encode_uint_scalar(self):
         # NO_DATA always encodes to 0.0.
         self.assertAlmostEqual(encode_uint_scalar(KB_NO_DATA, 0.0, 10.0, 0.1), 0.0)
 
+        # NAN always encodes to 0.0.
+        self.assertAlmostEqual(encode_uint_scalar(math.nan, 0.0, 10.0, 0.1), 0.0)
+        self.assertAlmostEqual(encode_uint_scalar(np.nan, 0.0, 10.0, 0.1), 0.0)
+
         # Test clipping.
         self.assertAlmostEqual(encode_uint_scalar(11.0, 0.0, 10.0, 0.1), 100.0)
         self.assertAlmostEqual(encode_uint_scalar(-100.0, 0.0, 10.0, 0.1), 1.0)