Commit 0565154c authored by Kristin Berry's avatar Kristin Berry
Browse files

Remove too close to zero comparison from distortion model

parent e627972d

isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp

+8 −13
Original line number Diff line number Diff line
@@ -114,12 +114,10 @@ namespace Isis { 
    // So, whenever x or y are too far from center or divider is near zero,

    // return the given inputs

    

    double epsilon = 0.0005;

    if ( (abs(divider) < epsilon) 

         || dx < -0.5*m_pixelPitch*m_width  - 0.2

         || dx >  0.5*m_pixelPitch*m_width  + 0.2

         || dy < -0.5*m_pixelPitch*m_height - 0.2

         || dy >  0.5*m_pixelPitch*m_height + 0.2 ) {

    if ( dx < -0.5*m_pixelPitch*m_width  - 0.2 ||

         dx >  0.5*m_pixelPitch*m_width  + 0.2 ||

         dy < -0.5*m_pixelPitch*m_height - 0.2 ||

         dy >  0.5*m_pixelPitch*m_height + 0.2 ) {

      p_undistortedFocalPlaneX = dx;

      p_undistortedFocalPlaneY = dy;
@@ -183,12 +181,10 @@ namespace Isis { 
    // So, whenever x or y are too far from center or divider is near zero,

    // return the given inputs



    double epsilon = 0.0005;

    if ( (abs(divider) < epsilon)

         || ux < -0.5*m_pixelPitch*m_width  - 0.2

         || ux >  0.5*m_pixelPitch*m_width  + 0.2

         || uy < -0.5*m_pixelPitch*m_height - 0.2

         || uy >  0.5*m_pixelPitch*m_height + 0.2 ) {

    if ( ux < -0.5*m_pixelPitch*m_width  - 0.2 ||

         ux >  0.5*m_pixelPitch*m_width  + 0.2 ||

         uy < -0.5*m_pixelPitch*m_height - 0.2 ||

         uy >  0.5*m_pixelPitch*m_height + 0.2 ) {

      p_focalPlaneX = ux;

      p_focalPlaneY = uy;
@@ -201,7 +197,6 @@ namespace Isis { 


    p_focalPlaneX = dx;

    p_focalPlaneY = dy;

    std::cout << "Difference ux-dx, uy-dy: " << ux-dx << ", " <<uy-dy << std::endl; 

    return true;

  }

isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ namespace Isis { 
   *   @history 2017-09-18 Jeannie Backer - Added check to verify that values

   *                           passed into SetFocalPlane and SetUndistortedFocalPlane

   *                           are within valid range. References #5155

   *   @history 2018-06-14 Kristin Berry - Switched from using qFuzzyCompare to

   *                           abs(val) < epsilon for comparison to fix "distortion

   *   @history 2018-06-15 Kristin Berry - Removed qFuzzyCompare comparison to fix "distortion

   *                           model not being applied" error. 

   */

  class TgoCassisDistortionMap : public CameraDistortionMap {