Avoid out-of-bounds Doppler look ups in geocodeSlc.

piyushrpt · Aug 14, 2020 · fda4e0a · fda4e0a
1 parent 5151f15
commit fda4e0a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/cxx/isce3/core/LUT2d.cpp b/cxx/isce3/core/LUT2d.cpp
@@ -121,8 +121,7 @@ eval(double y, double x) const {
     double y_idx = (y - _ystart) / _dy;
 
     // Check bounds or clamp indices to valid values
-    if (_boundsError && (x_idx < 0.0 || y_idx < 0.0
-            || x_idx >= _data.width() || y_idx >= _data.length())) {
+    if (_boundsError && not contains(y, x)) {
         pyre::journal::error_t errorChannel("isce.core.LUT2d");
         errorChannel
             << "Out of bounds LUT2d evaluation at " << y << " " << x

diff --git a/cxx/isce3/core/LUT2d.h b/cxx/isce3/core/LUT2d.h
@@ -75,6 +75,15 @@ class isce3::core::LUT2d {
         // Evaluate LUT    
         T eval(double y, double x) const;
 
+        /** Check if point resides in domain of LUT */
+        inline bool contains(double y, double x) const
+        {
+            const auto i = (y - _ystart) / _dy;
+            const auto j = (x - _xstart) / _dx;
+            return (i >= 0.0) && (i < _data.length()) &&
+                   (j >= 0.0) && (j < _data.width());
+        }
+
     private:
         // Flags
         bool _haveData, _boundsError;

diff --git a/cxx/isce3/geocode/geocodeSlc.cpp b/cxx/isce3/geocode/geocodeSlc.cpp
@@ -140,7 +140,8 @@ void isce3::geocode::geocodeSlc(
                           radarGrid.rangePixelSpacing();
 
             if (rdrY < 0 || rdrX < 0 || rdrY >= radarGrid.length() ||
-                rdrX >= radarGrid.width())
+                rdrX >= radarGrid.width() ||
+                not nativeDoppler.contains(aztime, srange))
                 continue;
 
             localAzimuthFirstLine = std::min(