Commit a83c61cd authored by Ken Edmundson's avatar Ken Edmundson
Browse files

Added members m_measureSigma and m_measureWeightSqrt; and corresponding 

accessors and mutators
parent 98ed8d01

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

+34 −0
Original line number Diff line number Diff line
@@ -393,6 +393,26 @@ namespace Isis { 
  }





  /**

   * Accesses the measure sigma

   *

   * @return double measure sigma

   */

  double BundleMeasure::measureSigma() const {

    return m_measureSigma;

  }





  /**

   * Accesses sqrt of measure weight for bundle

   *

   * @return double sqrt of measure weight

   */

  double BundleMeasure::measureWeightSqrt() const {

    return m_measureWeightSqrt;

  }





  /**

   * Accesses the residual magnitude for this control measure

   *
@@ -478,6 +498,20 @@ namespace Isis { 
  }





  /**

   * Sets sigma (uncertainty) of raw measure in mm and sqrt of weight for bundle

   *

   * @param double sigma

   *

   * TODO: what if camera has been subsampled, is pixel pitch computation still valid?

   *

   */

  void BundleMeasure::setMeasureSigma(double sigmaMultiplier) {

    m_measureSigma = sigmaMultiplier * m_controlMeasure->Camera()->PixelPitch();

    m_measureWeightSqrt = 1.0/m_measureSigma;

  }





  /**

   * Accesses the observation index for the parent observation

   *

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

+6 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ namespace Isis { 
      void setNormalsPositionBlockIndex(int index);

      void setNormalsPointingBlockIndex(int index);

      void setFocalPlaneResidualsMillimeters();

      void setMeasureSigma(double sigma);



      bool isRejected() const;

      Camera *camera() const;
@@ -111,6 +112,8 @@ namespace Isis { 
      double sampleResidual() const;

      double line() const;

      double lineResidual() const;

      double measureSigma() const;

      double measureWeightSqrt() const;

      double residualMagnitude() const;

      double xFocalPlaneResidual() const;

      double yFocalPlaneResidual() const;
@@ -142,6 +145,9 @@ namespace Isis { 


      double m_xFocalPlaneResidual;    //!< x focal plane residual in mm

      double m_yFocalPlaneResidual;    //!< y focal plane residual in mm



      double m_measureSigma;           //!< measure uncertainty in pixels

      double m_measureWeightSqrt;      //!< sqrt of measure weight

  };

  //! Definition for BundleMeasureQsp, a shared pointer to a BundleMeasure.

  typedef QSharedPointer<BundleMeasure> BundleMeasureQsp;