Merge branch 'isce-3:develop' into static_layers_pt2

Author: gshiroma

CMakeLists.txt

@@ -138,10 +138,6 @@ configure_file(
     doc/doxygen/Doxyfile.in
     doc/doxygen/Doxyfile
     )
-configure_file(
-    doc/sphinx/conf.py.in
-    doc/sphinx/conf.py
-    )
 
 if(NOT DEFINED SKBUILD)
     # If we're using scikit-build, the exported _IMPORT_PREFIX will be wrong:

CONTRIBUTING.md

@@ -29,7 +29,8 @@ for contributing to the project.
 ### Forking the isce3 repository
 
 If you are a first-time contributor, the first thing you should do is fork the
-isce3 repository to create your own copy of the project.
+isce3 repository to create your own copy of the project. (External contributors
+cannot directly create or modify branches on the isce3 repository.)
 
 1. Go to https://github.com/isce-framework/isce3 and click on the "Fork"
    button.
@@ -161,11 +162,22 @@ quality of the project.
 
 - Review may be requested by a PR author and/or other team members. Reviewers
   can make comments, request changes, or approve the PR, indicating that it has
-  been carefully examined and is ready for merging. Before a PR can be merged,
-  it must be approved by at least two core team members.
+  been carefully examined and is ready for merging.
+- Before a PR can be merged, it must be approved by at least two core team
+  members.
+
+### Testing and scanning
+
 - CI jobs that build and test the code are automatically triggered upon each PR
   update. The CI tests must pass before your PR can be merged. To avoid overuse
   of these resources, it's helpful to test all changes locally before committing
   and push commits in batches rather than individually.
-- After all required checks have passed, the PR can be merged by pressing the
-  "Squash and merge" button.
+- Each commit is scanned using
+  [detect-secrets](https://github.com/Yelp/detect-secrets) and
+  [CodeQL](https://codeql.github.com/) to identify possible security
+  vulnerabilities and exposed credentials. Commits containing either may be
+  blocked.
+- Linters may be run on the changes and may reject PRs that don't conform to the
+  project's style conventions.
+
+After all required checks have passed, the PR may be merged by a maintainer.

cxx/isce3/core/EulerAngles.h

@@ -63,7 +63,7 @@ class EulerAngles {
     Quaternion toQuaternion() const;
 
     /**
-     * Check if *this is approximatly equals to other within
+     * Check if *this is approximately equals to other within
      * a desired precision
      * @param[in] other : another EulerAngles object
      * @param[in] prec (optional) : double scalar precision

cxx/isce3/core/LUT2d.h

@@ -55,6 +55,10 @@ class isce3::core::LUT2d {
         inline double xStart() const { return _xstart; }
         // Get starting Y-coordinate
         inline double yStart() const { return _ystart; }
+        // Get end X-coordinate
+        inline double xEnd() const { return xStart() + (width() - 1) * xSpacing(); }
+        // Get end Y-coordinate
+        inline double yEnd() const { return yStart() + (length() - 1) * ySpacing(); }
         // Get X-spacing
         inline double xSpacing() const { return _dx; }
         // Get Y-spacing
@@ -96,10 +100,8 @@ class isce3::core::LUT2d {
                 return true;
             }
 
-            const auto i = (x - xStart()) / xSpacing();
-            const auto j = (y - yStart()) / ySpacing();
-            return (i >= 0.0 and i <= width() - 1.0) and
-                   (j >= 0.0 and j <= length() - 1.0);
+            return (x >= xStart()) and (x <= xEnd()) and
+                   (y >= yStart()) and (y <= yEnd());
         }
 
     private:

cxx/isce3/core/Projections.h

@@ -214,7 +214,7 @@ class PolarStereo : public ProjectionBase {
     /** @copydoc ProjectionBase::print() */
     void print() const override;
 
-    /** Transfrom from llh(rad) to Polar Stereo (m) */
+    /** Transform from llh(rad) to Polar Stereo (m) */
     int forward(const Vec3&, Vec3&) const override;
 
     /** Transform from Polar Stereo (m) to llh (rad) */

cxx/isce3/core/Serialization.h

@@ -340,12 +340,12 @@ inline void saveCalGrid(isce3::io::IGroup & group,
 {
     // Generate uniformly spaced X (slant range) coordinates
     const double x0 = lut.xStart();
-    const double x1 = x0 + lut.xSpacing() * (lut.width() - 1.0);
+    const double x1 = lut.xEnd();
     const std::vector<double> x = isce3::core::linspace(x0, x1, lut.width());
 
     // Generate uniformly spaced Y (zero Doppler time) coordinates
     const double y0 = lut.yStart();
-    const double y1 = y0 + lut.ySpacing() * (lut.length() - 1.0);
+    const double y1 = lut.yEnd();
     const std::vector<double> y = isce3::core::linspace(y0, y1, lut.length());
 
     // Save coordinates

cxx/isce3/core/Utilities.h

@@ -251,7 +251,7 @@ namespace isce3 { namespace core {
     }
 
     /** making a boolean mask for an array based on noDataValue
-     * @param[in] v inout array
+     * @param[in] v input array
      * @param[in] noDataValue the value used to create the mask
      * @param[out] returns a boolean mask */
     template <typename T>
@@ -269,7 +269,7 @@ namespace isce3 { namespace core {
     }
 
     /** making a boolean mask for an array based on noDataValue
-     * @param[in] v inout array
+     * @param[in] v input array
      * @param[in] noDataValue the value used to create the mask
      * @param[out] returns a boolean mask */
     template <typename T>

cxx/isce3/core/detail/Interp1d.h

@@ -6,7 +6,7 @@
 
 namespace isce3::core::detail {
 
-/** Get interpolator coefficents for a given offset.
+/** Get interpolator coefficients for a given offset.
  *
  * @param[in]  kernel Kernel function to use for interpolation.
  * @param[in]  t      Desired time sample (0 <= t < array_size).
@@ -46,7 +46,7 @@ void interp1d_coeffs(const Kernel<KernelType>& kernel, const double t,
  * @param[in]  low      Index to start of selection.
  * @param[in]  data     Buffer to take selection from.
  * @param[in]  size     Size of buffer (number of elements).
- * @param[in]  stride   Stride betwen elements in data buffer.
+ * @param[in]  stride   Stride between elements in data buffer.
  * @param[in]  periodic Whether to use periodic boundary condition.
  *
  * @returns Pointer to contiguous selection in `data` or to `block` if copied.

cxx/isce3/cuda/Headers.cmake

@@ -39,6 +39,7 @@ geometry/Topo.h
 geometry/utilities.h
 image/forward.h
 image/gpuResampSlc.h
+image/Resample.h
 image/ResampSlc.h
 math/complexOperations.h
 product/SubSwaths.h

cxx/isce3/cuda/Sources.cmake

@@ -27,6 +27,7 @@ geometry/gpuTopoLayers.cpp
 geometry/Topo.cpp
 geometry/utilities.cu
 image/gpuResampSlc.cu
+image/Resample.cu
 image/ResampSlc.cpp
 matchtemplate/pycuampcor/cuAmpcorChunk.cu
 matchtemplate/pycuampcor/cuAmpcorController.cu