Unverified Commit 2f577a4d authored by jcwbacker's avatar jcwbacker Committed by GitHub
Browse files

Merge pull request #237 from kberryUSGS/CaSSIS_Pipeline 

Fixed distortion model not being applied error
parents 6f918c93 e627972d

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

+10 −3
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ namespace Isis { 
      m_A2_dist.push_back(p_camera->getDouble(od + "A2_DIST", i));

      m_A3_dist.push_back(p_camera->getDouble(od + "A3_DIST", i));

    }



    m_pixelPitch = p_camera->getDouble("INS" + toString(naifIkCode) + "_PIXEL_PITCH");

    m_width  = p_camera->getDouble("INS" + toString(naifIkCode) + "_FILTER_SAMPLES");

    m_height = p_camera->getDouble("INS" + toString(naifIkCode) + "_FILTER_LINES");
@@ -114,13 +113,16 @@ namespace Isis { 
    // 

    // So, whenever x or y are too far from center or divider is near zero,

    // return the given inputs

    if ( qFuzzyCompare(divider + 1.0,  1.0) == 0

    

    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 ) {

      p_undistortedFocalPlaneX = dx;

      p_undistortedFocalPlaneY = dy;



      return true;

    }
@@ -130,6 +132,7 @@ namespace Isis { 


    p_undistortedFocalPlaneX = ux;

    p_undistortedFocalPlaneY = uy;



    return true;

  }
@@ -179,13 +182,16 @@ namespace Isis { 
    // 

    // So, whenever x or y are too far from center or divider is near zero,

    // return the given inputs

    if ( qFuzzyCompare(divider + 1.0,  1.0) == 0



    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 ) {

      p_focalPlaneX = ux;

      p_focalPlaneY = uy;



      return true;

    }
@@ -195,6 +201,7 @@ 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

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ 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

   *                           model not being applied" error. 

   */

  class TgoCassisDistortionMap : public CameraDistortionMap {

    public: