Simplify a resamp constructor (#889)

* remove redundant wavelength parameter from resamp constructor

* update pybind constructors and add contain method to LUT2d

Author: Liang Yu

cxx/isce3/cuda/image/ResampSlc.h

@@ -14,17 +14,16 @@ class isce3::cuda::image::ResampSlc : public isce3::image::ResampSlc {
         inline ResampSlc(const isce3::product::Product &product, char frequency = 'A') :
             isce3::image::ResampSlc(product, frequency) {}
 
-        // Constructor from an isce3::product::Product and reference product (flattening) 
+        // Constructor from an isce3::product::Product and reference product (flattening)
         inline ResampSlc(const isce3::product::Product & product,
                          const isce3::product::Product & refProduct,
                          char frequency = 'A') :
             isce3::image::ResampSlc(product, refProduct, frequency) {}
 
         /** Constructor from an isce3::product::RadarGridParameters (no flattening) */
         inline ResampSlc(const isce3::product::RadarGridParameters & rdr_grid,
-                         const isce3::core::LUT2d<double> & doppler,
-                         double wvl) :
-            isce3::image::ResampSlc(rdr_grid, doppler, wvl) {}
+                         const isce3::core::LUT2d<double> & doppler) :
+            isce3::image::ResampSlc(rdr_grid, doppler) {}
 
         /** Constructor from an isce3::product::RadarGridParameters and reference radar grid (flattening) */
         inline ResampSlc(const isce3::product::RadarGridParameters & rdr_grid,
@@ -53,13 +52,13 @@ class isce3::cuda::image::ResampSlc : public isce3::image::ResampSlc {
         // Generic resamp entry point from externally created rasters
         void resamp(isce3::io::Raster & inputSlc, isce3::io::Raster & outputSlc,
                     isce3::io::Raster & rgOffsetRaster, isce3::io::Raster & azOffsetRaster,
-                    int inputBand=1, bool flatten=false, bool isComplex=true, int rowBuffer=40, 
+                    int inputBand=1, bool flatten=false, bool isComplex=true, int rowBuffer=40,
                     int chipSize=isce3::core::SINC_ONE);
 
         // Generic resamp entry point: use filenames to create rasters
         void resamp(const std::string & inputFilename, const std::string & outputFilename,
                     const std::string & rgOffsetFilename, const std::string & azOffsetFilename,
                     int inputBand=1, bool flatten=false, bool isComplex=true, int rowBuffer=40,
                     int chipSize=isce3::core::SINC_ONE);
-        
+
 };

cxx/isce3/image/ResampSlc.h

@@ -45,7 +45,7 @@ class ResampSlc {
      * Constructor from an isce3::product::RadarGridParameters (no flattening)
      */
     ResampSlc(const isce3::product::RadarGridParameters& rdr_grid,
-              const isce3::core::LUT2d<double>& doppler, double wvl);
+              const isce3::core::LUT2d<double>& doppler);
 
     /**
      * Constructor from an isce3::product::RadarGridParameters and reference

cxx/isce3/image/ResampSlc.icc

@@ -49,13 +49,12 @@ inline ResampSlc::ResampSlc(const isce3::product::Swath& swath,
 
 // Constructor from an isce3::product::RadarGridParameters (no flattening)
 inline ResampSlc::ResampSlc(const isce3::product::RadarGridParameters& rdr_grid,
-                            const isce3::core::LUT2d<double>& doppler,
-                            double wvl)
+                            const isce3::core::LUT2d<double>& doppler)
     : _haveRefData(false), _dopplerLUT(doppler),
       _startingRange(rdr_grid.startingRange()),
       _rangePixelSpacing(rdr_grid.rangePixelSpacing()),
       _sensingStart(rdr_grid.sensingStart()), _prf(rdr_grid.prf()),
-      _wavelength(wvl)
+      _wavelength(rdr_grid.wavelength())
 {}
 
 // Constructor from an isce3::product::RadarGridParameters and reference radar

python/extensions/pybind_isce3/core/LUT2d.cpp

@@ -123,6 +123,10 @@ void addbinding(py::class_<LUT2d<T>> &pyLUT2d)
             py::arg("epoch"),
             py::arg("units") = "")
 
+        .def("contains", &LUT2d<T>::contains,
+            "Check if point (y, x) resides in domain of LUT",
+            py::arg("y"),
+            py::arg("x"))
         .def_property_readonly("have_data", &LUT2d<T>::haveData)
         .def_property_readonly("ref_value", &LUT2d<T>::refValue)
         .def_property_readonly("x_start",   &LUT2d<T>::xStart)

python/extensions/pybind_isce3/cuda/image/ResampSlc.cpp

@@ -2,8 +2,10 @@
 
 #include <isce3/core/Constants.h>
 #include <isce3/core/LUT2d.h>
+#include <isce3/core/Poly2d.h>
 #include <isce3/io/Raster.h>
 
+using isce3::core::Poly2d;
 using isce3::cuda::image::ResampSlc;
 
 namespace py = pybind11;
@@ -31,10 +33,22 @@ void addbinding(py::class_<ResampSlc> & pyResampSlc)
                 py::arg("ref_range_pixel_spacing"),
                 py::arg("ref_wavelength"))
         .def(py::init<const isce3::product::RadarGridParameters &,
-                const isce3::core::LUT2d<double> &, double>(),
+                const isce3::core::LUT2d<double> &>(),
+                py::arg("rdr_grid"),
+                py::arg("doppler"))
+        .def(py::init([](const isce3::product::RadarGridParameters & grid,
+                const isce3::core::LUT2d<double> & doppler,
+                const Poly2d & az_carrier,
+                const Poly2d & rg_carrier) {
+                    auto resamp = ResampSlc(grid, doppler);
+                    resamp.azCarrier(az_carrier);
+                    resamp.rgCarrier(rg_carrier);
+                    return resamp;
+                }),
                 py::arg("rdr_grid"),
                 py::arg("doppler"),
-                py::arg("wavelength"))
+                py::arg("azimuth_carrier")=Poly2d(),
+                py::arg("range_carrier")=Poly2d())
         .def(py::init<const isce3::product::RadarGridParameters &,
                 const isce3::product::RadarGridParameters &,
                 const isce3::core::LUT2d<double> &, double, double>(),

python/extensions/pybind_isce3/image/ResampSlc.cpp

@@ -2,8 +2,10 @@
 
 #include <isce3/core/Constants.h>
 #include <isce3/core/LUT2d.h>
+#include <isce3/core/Poly2d.h>
 #include <isce3/io/Raster.h>
 
+using isce3::core::Poly2d;
 using isce3::image::ResampSlc;
 
 namespace py = pybind11;
@@ -31,10 +33,22 @@ void addbinding(py::class_<ResampSlc> & pyResampSlc)
                 py::arg("ref_range_pixel_spacing"),
                 py::arg("ref_wavelength"))
         .def(py::init<const isce3::product::RadarGridParameters &,
-                const isce3::core::LUT2d<double> &, double>(),
+                const isce3::core::LUT2d<double> &>(),
+                py::arg("rdr_grid"),
+                py::arg("doppler"))
+        .def(py::init([](const isce3::product::RadarGridParameters & grid,
+                const isce3::core::LUT2d<double> & doppler,
+                const Poly2d & az_carrier,
+                const Poly2d & rg_carrier) {
+                    auto resamp = ResampSlc(grid, doppler);
+                    resamp.azCarrier(az_carrier);
+                    resamp.rgCarrier(rg_carrier);
+                    return resamp;
+                }),
                 py::arg("rdr_grid"),
                 py::arg("doppler"),
-                py::arg("wavelength"))
+                py::arg("azimuth_carrier")=Poly2d(),
+                py::arg("range_carrier")=Poly2d())
         .def(py::init<const isce3::product::RadarGridParameters &,
                 const isce3::product::RadarGridParameters &,
                 const isce3::core::LUT2d<double> &, double, double>(),

python/packages/nisar/workflows/resample_slc.py

@@ -81,7 +81,7 @@ def run(cfg, resample_type):
         else:
             Resamp = isce3.image.ResampSlc
 
-        resamp_obj = Resamp(radar_grid, native_doppler, radar_grid.wavelength)
+        resamp_obj = Resamp(radar_grid, native_doppler)
 
         # If lines per tile is > 0, assign it to resamp_obj
         if resamp_args['lines_per_tile']:

tests/python/extensions/pybind/cuda/image/resamp.py

@@ -20,7 +20,7 @@ def test_run():
     slc = SLC(hdf5file=h5_path)
 
     # init resamp obj
-    resamp = isce3.cuda.image.ResampSlc(grid, slc.getDopplerCentroid(), grid.wavelength)
+    resamp = isce3.cuda.image.ResampSlc(grid, slc.getDopplerCentroid())
     resamp.lines_per_tile = 249
 
     # prepare rasters
@@ -47,7 +47,7 @@ def test_validate():
 
     # load reference data and avoid edges
     ref_slc = np.fromfile(iscetest.data+'warped_envisat.slc', dtype=np.complex64).reshape(500,500)[20:-20,20:-20]
-    
+
     # get normalized error
     abs_error = np.abs(np.sum(test_slc - ref_slc) / test_slc.size)
 

tests/python/extensions/pybind/image/resamp.py

@@ -20,7 +20,7 @@ def test_run():
     slc = SLC(hdf5file=h5_path)
 
     # init resamp obj
-    resamp = isce3.image.ResampSlc(grid, slc.getDopplerCentroid(), grid.wavelength)
+    resamp = isce3.image.ResampSlc(grid, slc.getDopplerCentroid())
     resamp.lines_per_tile = 249
 
     # prepare rasters
@@ -47,7 +47,7 @@ def test_validate():
 
     # load reference data and avoid edges
     ref_slc = np.fromfile(iscetest.data+'warped_envisat.slc', dtype=np.complex64).reshape(500,500)[20:-20,20:-20]
-    
+
     # get normalized error
     abs_error = np.abs(np.sum(test_slc - ref_slc) / test_slc.size)