Merge pull request #19 from leiyangleon/geogrid_runinfo_radar_update

update the testGeogrid 'runinfo' output with those extracted from the Geogrid c++ source code
nasa-jpl · Mar 17, 2021 · f5cc354 · f5cc354
2 parents ef6be08 + c9d4e16
commit f5cc354
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 7 deletions.
diff --git a/geo_autoRIFT/geogrid/Geogrid.py b/geo_autoRIFT/geogrid/Geogrid.py
@@ -65,6 +65,9 @@ def geogrid(self):
 
         ##Run
         geogrid.geogrid_Py(self._geogrid)
+
+        ##Get parameters
+        self.getState()
 
         ##Clean up
         self.finalize()
@@ -213,14 +216,23 @@ def getIncidenceAngle(self, zrange=[-200,4000]):
 
         self.incidenceAngle = np.mean(thetas)
 
-
     def getDEM(self, bbox):
         '''
         Look up database and return values.
         '''
 
         return "", "", "", "", ""
 
+    def getState(self):
+        from components.contrib.geo_autoRIFT.geogrid import geogrid
+
+        self.pOff = geogrid.getXOff_Py(self._geogrid)
+        self.lOff = geogrid.getYOff_Py(self._geogrid)
+        self.pCount = geogrid.getXCount_Py(self._geogrid)
+        self.lCount = geogrid.getYCount_Py(self._geogrid)
+        self.X_res = geogrid.getXPixelSize_Py(self._geogrid)
+        self.Y_res = geogrid.getYPixelSize_Py(self._geogrid)
+
     def setState(self):
         '''
         Create C object and populate.
@@ -343,3 +355,11 @@ def __init__(self):
         ##Pointer to C 
         self._geogrid = None
         self._orbit = None
+
+        ##parameters for autoRIFT
+        self.pOff = None
+        self.lOff = None
+        self.pCount = None
+        self.lCount = None
+        self.X_res = None
+        self.Y_res = None
diff --git a/geo_autoRIFT/geogrid/bindings/geogridmodule.cpp b/geo_autoRIFT/geogrid/bindings/geogridmodule.cpp
@@ -443,6 +443,90 @@ PyObject* setOrbit(PyObject *self, PyObject *args)
     return Py_BuildValue("i", 0);
 }
 
+PyObject* getXOff(PyObject *self, PyObject *args)
+{
+    int var;
+    uint64_t ptr;
+
+    if (!PyArg_ParseTuple(args, "K", &ptr))
+    {
+        return NULL;
+    }
+
+    var = ((geoGrid*)(ptr))->pOff;
+    return Py_BuildValue("i",var);
+}
+
+PyObject* getYOff(PyObject *self, PyObject *args)
+{
+    int var;
+    uint64_t ptr;
+
+    if (!PyArg_ParseTuple(args, "K", &ptr))
+    {
+        return NULL;
+    }
+
+    var = ((geoGrid*)(ptr))->lOff;
+    return Py_BuildValue("i",var);
+}
+
+PyObject* getXCount(PyObject *self, PyObject *args)
+{
+    int var;
+    uint64_t ptr;
+
+    if (!PyArg_ParseTuple(args, "K", &ptr))
+    {
+        return NULL;
+    }
+
+    var = ((geoGrid*)(ptr))->pCount;
+    return Py_BuildValue("i",var);
+}
+
+PyObject* getYCount(PyObject *self, PyObject *args)
+{
+    int var;
+    uint64_t ptr;
+
+    if (!PyArg_ParseTuple(args, "K", &ptr))
+    {
+        return NULL;
+    }
+
+    var = ((geoGrid*)(ptr))->lCount;
+    return Py_BuildValue("i",var);
+}
+
+PyObject* getXPixelSize(PyObject *self, PyObject *args)
+{
+    double var;
+    uint64_t ptr;
+
+    if (!PyArg_ParseTuple(args, "K", &ptr))
+    {
+        return NULL;
+    }
+
+    var = ((geoGrid*)(ptr))->grd_res;
+    return Py_BuildValue("d",var);
+}
+
+PyObject* getYPixelSize(PyObject *self, PyObject *args)
+{
+    double var;
+    uint64_t ptr;
+
+    if (!PyArg_ParseTuple(args, "K", &ptr))
+    {
+        return NULL;
+    }
+
+    var = ((geoGrid*)(ptr))->azm_res;
+    return Py_BuildValue("d",var);
+}
+
 
 PyObject* geogrid(PyObject* self, PyObject* args)
 {

diff --git a/geo_autoRIFT/geogrid/include/geogrid.h b/geo_autoRIFT/geogrid/include/geogrid.h
@@ -70,6 +70,8 @@ struct geoGrid
     int lookSide;
     int nodata_out;
     double incidenceAngle;
+    int pOff, lOff, pCount, lCount;
+    double grd_res, azm_res;
 
     //Output file names
     std::string pixlinename;

diff --git a/geo_autoRIFT/geogrid/include/geogridmodule.h b/geo_autoRIFT/geogrid/include/geogridmodule.h
@@ -67,6 +67,12 @@ extern "C"
         PyObject * setChipSizeX0(PyObject *, PyObject *);
         PyObject * setXLimits(PyObject *, PyObject *);
         PyObject * setYLimits(PyObject *, PyObject *);
+        PyObject * getXPixelSize(PyObject *, PyObject *);
+        PyObject * getYPixelSize(PyObject *, PyObject *);
+        PyObject * getXOff(PyObject *, PyObject *);
+        PyObject * getYOff(PyObject *, PyObject *);
+        PyObject * getXCount(PyObject *, PyObject *);
+        PyObject * getYCount(PyObject *, PyObject *);
 }
 
 static PyMethodDef geogrid_methods[] =
@@ -93,6 +99,12 @@ static PyMethodDef geogrid_methods[] =
         {"setNodataOut_Py", setNodataOut, METH_VARARGS, " "},
         {"setXLimits_Py", setXLimits, METH_VARARGS, " "},
         {"setYLimits_Py", setYLimits, METH_VARARGS, " "},
+        {"getXPixelSize_Py", getXPixelSize, METH_VARARGS, " "},
+        {"getYPixelSize_Py", getYPixelSize, METH_VARARGS, " "},
+        {"getXOff_Py", getXOff, METH_VARARGS, " "},
+        {"getYOff_Py", getYOff, METH_VARARGS, " "},
+        {"getXCount_Py", getXCount, METH_VARARGS, " "},
+        {"getYCount_Py", getYCount, METH_VARARGS, " "},
         {"setWindowLocationsFilename_Py", setWindowLocationsFilename, METH_VARARGS, " "},
         {"setWindowOffsetsFilename_Py", setWindowOffsetsFilename, METH_VARARGS, " "},
         {"setWindowSearchRangeFilename_Py", setWindowSearchRangeFilename, METH_VARARGS, " "},

diff --git a/geo_autoRIFT/geogrid/src/geogrid.cpp b/geo_autoRIFT/geogrid/src/geogrid.cpp
@@ -284,11 +284,16 @@ void geoGrid::geogrid()
 
 
     //Get offsets and size to read from DEM
-    int lOff = std::max( std::floor((ymax - geoTrans[3])/geoTrans[5]), 0.);
-    int lCount = std::min( std::ceil((ymin - geoTrans[3])/geoTrans[5]), demYSize-1.) - lOff;
-
-    int pOff = std::max( std::floor((xmin - geoTrans[0])/geoTrans[1]), 0.);
-    int pCount = std::min( std::ceil((xmax - geoTrans[0])/geoTrans[1]), demXSize-1.) - pOff;
+//    int lOff = std::max( std::floor((ymax - geoTrans[3])/geoTrans[5]), 0.);
+//    int lCount = std::min( std::ceil((ymin - geoTrans[3])/geoTrans[5]), demYSize-1.) - lOff;
+//
+//    int pOff = std::max( std::floor((xmin - geoTrans[0])/geoTrans[1]), 0.);
+//    int pCount = std::min( std::ceil((xmax - geoTrans[0])/geoTrans[1]), demXSize-1.) - pOff;
+    lOff = std::max( std::floor((ymax - geoTrans[3])/geoTrans[5]), 0.);
+    lCount = std::min( std::ceil((ymin - geoTrans[3])/geoTrans[5]), demYSize-1.) - lOff;
+
+    pOff = std::max( std::floor((xmin - geoTrans[0])/geoTrans[1]), 0.);
+    pCount = std::min( std::ceil((xmax - geoTrans[0])/geoTrans[1]), demXSize-1.) - pOff;
 
 
     std::cout << "Xlimits : " << geoTrans[0] + pOff * geoTrans[1] <<  "  " 
@@ -648,7 +653,7 @@ void geoGrid::geogrid()
 
 
     // ground range and azimuth pixel size
-    double grd_res, azm_res;
+//    double grd_res, azm_res;
 
 //    double incang = 38.0*deg2rad;
     double incang = incidenceAngle;