Commit 29c7b516 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

Fixes to setNormalsBlockIndices method, also removed 

+   *                           argument bool solveTargetBody and added history entry to header
parent 7fa0bd92

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

+8 −8
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ namespace Isis { 
   * @throws IException::Programmer "In BundleMeasure::setNormalsBlockIndices:

   *                                 parent observation has not been set."

   */

  void BundleMeasure::setNormalsBlockIndices(int solveTargetBody) {

  void BundleMeasure::setNormalsBlockIndices() {

    if (!m_parentObservation) {

      QString msg = "In BundleMeasure::setNormalsBlockIndices: "

                    "parent observation has not been set.\n";
@@ -171,18 +171,18 @@ namespace Isis { 
         BundleObservationSolveSettings::AnglesOnly) ? true : false;



    if (solveForPosition) {

      setNormalsPositionBlockIndex(normalsStartBlock + m_polyPositionSegmentIndex +

                                   solveTargetBody);

      int normalsPositionBlockIndex = normalsStartBlock + m_polyPositionSegmentIndex;

      setNormalsPositionBlockIndex(normalsPositionBlockIndex);



      if (solveForPointing) {

        setNormalsPointingBlockIndex(normalsStartBlock +

        int normalsPointingBlockIndex = normalsStartBlock +

                                        m_parentObservation->numberPolynomialPositionSegments() +

                                     m_polyPointingSegmentIndex + solveTargetBody);

                                        m_polyPointingSegmentIndex;

        setNormalsPointingBlockIndex(normalsPointingBlockIndex);

      }

    }

    else if (solveForPointing) {

      setNormalsPointingBlockIndex(normalsStartBlock + m_polyPointingSegmentIndex +

                                   solveTargetBody);

      setNormalsPointingBlockIndex(normalsStartBlock + m_polyPointingSegmentIndex);

    }

  }

isis/src/control/objs/BundleUtilities/BundleMeasure.h

+3 −1
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ namespace Isis { 
   *                           implementation.

   *   @history 2018-06-27 Ken Edmundson - Added members m_measureSigma and m_measureWeightSqrt; and

   *                           corresponding accessors and mutators.

   *   @history 2018-11-29 Ken Edmundson - Fixes to setNormalsBlockIndices method, also removed

   *                           argument bool solveTargetBody.

   */



  class BundleMeasure {
@@ -95,7 +97,7 @@ namespace Isis { 


      void setImage();

      void setPolySegmentIndices();

      void setNormalsBlockIndices(int solveTargetBody=0);

      void setNormalsBlockIndices();

      void setPolyPositionSegmentIndex(int index);

      void setPolyPointingSegmentIndex(int index);

      void setNormalsPositionBlockIndex(int index);