Unverified Commit 73e3db57 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Fixed jigsaw residual reporting in bundleout.txt (#4676) 

* Fixed jigsaw residual calculations

* residual fix changelog

* Added jigsaw changes
parent 27c0f32f

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ release. 


## [Unreleased]



### Fixed

- Fixed a bug where the measure residuals reported in the bundleout.txt file were incorrect. [#4655](https://github.com/USGS-Astrogeology/ISIS3/issues/4655)



### Added

- Added the USECAMSTATSTBL option to caminfo. This allows caminfo to extract existing

camera statistics from the CameraStatistics Table of the input cube instead

isis/src/control/apps/jigsaw/jigsaw.xml

+11 −0
Original line number Diff line number Diff line
@@ -319,6 +319,17 @@ 
      rand notebook that jigsaw was based on. Also added a section in the documentation

      describing the target body radii solve issue.

    </change>

    <change name="Jesse Mapel and Kristin Berry" date="2021-06-29">

      Added the ability to bundle adjust images that use a CSM based model. New parameters

      CSMSOLVESET, CSMSOLVELIST, and CSMSOLVEYPE were added to specify which parameters to

      solve for. These parameters can also be used as keys in the SCCONFIG file.



      Modified images CSV file to generate a separate CSV for each sensor being adjusted.

    </change>

    <change name="Jesse Mapel" date="2021-11-09">

      Fixed measure residual reporting in bundleout.txt file to match the residuals

      reported in the residuals CSV file.

    </change>

  </history>



  <groups>

isis/src/control/objs/BundleUtilities/IsisBundleObservation.cpp

+2 −3
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ QStringList IsisBundleObservation::parameterList() { 
   * Converts the observed value from a focal plane coordinate to

   * an image sample or line.

   *

   * @param measure measure The measure that the partials are

   * @param measure The measure that the partials are

   *                being computed for.

   * @param deltaVal The difference between the measured and

   *                 calculated focal plane coordinate
@@ -1368,8 +1368,7 @@ QStringList IsisBundleObservation::parameterList() { 
   *                calculated (line, sample) coordinate

   */

  double IsisBundleObservation::computeObservationValue(BundleMeasure &measure, double deltaVal) {

    Camera *measureCamera = measure.camera();

    return deltaVal / measureCamera->PixelPitch();

    return deltaVal * 1.4;

  }

}

isis/tests/FunctionalTestsJigsaw.cpp

+8 −1
Original line number Diff line number Diff line
@@ -978,7 +978,14 @@ End)"); 
  EXPECT_THAT(lines[75].toStdString(), HasSubstr("RADII: MEAN"));

  EXPECT_PRED_FORMAT2(AssertQStringsEqual, lines[76].trimmed(), "");



  QStringList columns = lines[159].split(QRegExp("\\s+"), QString::SkipEmptyParts);

  QStringList columns = lines[132].split(QRegExp("\\s+"), QString::SkipEmptyParts);

  EXPECT_PRED_FORMAT2(AssertQStringsEqual, columns[0], "minimum:");

  EXPECT_NEAR(columns[1].toDouble(), -178.8718, 0.001);

  columns = lines[136].split(QRegExp("\\s+"), QString::SkipEmptyParts);

  EXPECT_PRED_FORMAT2(AssertQStringsEqual, columns[0], "maximum:");

  EXPECT_NEAR(columns[1].toDouble(), 175.7307, 0.001);



  columns = lines[159].split(QRegExp("\\s+"), QString::SkipEmptyParts);

  EXPECT_PRED_FORMAT2(AssertQStringsEqual, columns[0], "POLE");

  EXPECT_PRED_FORMAT2(AssertQStringsEqual, columns[1], "RA");

  EXPECT_NEAR(columns[2].toDouble(), 269.9949, 0.0001);