Commit d57c8aa0 authored by Oxez's avatar Oxez
Browse files

Made changes

parent 68b6bd41
Loading
Loading
Loading
Loading
+14 −15
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ namespace Isis {
      // Set dalpha to be half the grid spacing for nyquist sampling
      //double dalpha = (PI/180.0)/(2.0*p_demScale);
      double cmin = cos((90.0 - 1.0 / (2.0 * demScale())) * DEG2RAD);
      double dalpha = MAX(cos(g1lat * DEG2RAD), cmin) / (2.0 * demScale() * DEG2RAD);
      double dalpha = MAX(cos(g1lat * DEG2RAD), cmin) / (2.0 * demScale() * RAD2DEG);

      // Previous Sensor version used local version of this method with lat and lon doubles.  Steven said
      // it didn't make a significant difference in speed.
@@ -384,7 +384,7 @@ namespace Isis {
        // put in a test (above) for dd being smaller than the pixel
        // convergence tolerance.  If so the loop exits without an
        // intersection
        dalpha = MAX(cos(g2lat * DEG2RAD), cmin) / (2.0 * demScale() * DEG2RAD);
        dalpha = MAX(cos(g2lat * DEG2RAD), cmin) / (2.0 * demScale() * RAD2DEG);
      } // end while

      SpiceDouble intersectionPoint[3];
@@ -412,4 +412,3 @@ namespace Isis {
  }
  // Do nothing since the DEM intersection was already successful
}
+5 −3
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ namespace Isis {
   *                           intersection in intersectSurface() method to prevent early return
   *                           and attempt the iterative method even when the ellipsoid is not
   *                           intersected. Fixes #1438
   *   @history 2018-01-05 Cole Neubauer - Fixed units conversion in intersectSurface so that the
   *                           loop is stepping by radians per pixel, as recommended by Jeff
   *                           Anderson (LROC team). Fixes #5245
   */
  class EquatorialCylindricalShape : public DemShape {
    public:
@@ -67,4 +70,3 @@ namespace Isis {
};

#endif