Unverified Commit 161378fa authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #192 from makaylas/cassis 

Merged dev in
parents 3d5313f0 8ccd2c6e

isis/src/base/objs/EmbreeShapeModel/EmbreeShapeModel.cpp

+0 −44
Original line number Diff line number Diff line
@@ -593,50 +593,6 @@ namespace Isis { 
  }





  /**

   * Computes and returns emission angle, in degrees, given the observer

   * position. The surface normal vector is calculated using an ellipsoid, not

   * the local normal of the actual target shape.

   *

   * Emission Angle: The angle between the surface normal vector at the

   * intersection point and the vector from the intersection point to the

   * observer (usually the spacecraft). The emission angle varies from 0 degrees

   * when the observer is viewing the sub-spacecraft point (nadir viewing) to 90

   * degrees when the intercept is tangent to the surface of the target body.

   * Thus, higher values of emission angle indicate more oblique viewing of the

   * target.

   *

   * @param observerBodyFixedPosition  Three dimensional position of the observer,

   *                                   in the coordinate system of the target body.

   *

   * @return The emission angle, in decimal degrees.

   *

   */

  double EmbreeShapeModel::emissionAngle(const std::vector<double> &observerBodyFixedPosition) {



    // If there is already a normal save it, because it's probably the local normal

    std::vector<double> localNormal;

    bool hadNormal = hasNormal();

    if ( hadNormal ) {

      localNormal = normal();

    }



    // Calculate the ellipsoid surface normal

    calculateDefaultNormal();

    

    // Use ShapeModel to calculate the ellipsoid emission angle

    double ellipsoidEmission = ShapeModel::emissionAngle(observerBodyFixedPosition);



    // If there's a saved normal, reset it

    if ( hadNormal ) {

      setNormal(localNormal);

    }



    // Return the ellipsoid emission angle

    return ellipsoidEmission;

  }





  /**

   * Computes and returns incidence angle, in degrees, given the illuminator position.

   * The surface normal vector is calculated using an ellipsoid, not the local

isis/src/base/objs/EmbreeShapeModel/EmbreeShapeModel.h

+2 −2
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ namespace Isis { 
   *

   * @internal

   *   @history 2017-04-22 Jesse Mapel and Jeannie Backer - Original Version

   *   @history 2018-05-01 Christopher Combs - Removed emissionAngle function to

   *                fix issues with using ellipsoids to find normals. Fixes #5387.

   */

  class EmbreeShapeModel : public ShapeModel {

    public:
@@ -84,10 +86,8 @@ namespace Isis { 
      virtual void calculateSurfaceNormal();

      QVector<double> ellipsoidNormal();



      virtual double emissionAngle(const std::vector<double> &sB);

      virtual double incidenceAngle(const std::vector<double> &uB);





      virtual Distance localRadius(const Latitude &lat, const Longitude &lon);



      // Determine if the internal intercept is occluded from the observer/lookdir

isis/src/base/objs/PushFrameCameraCcdLayout/PushFrameCameraCcdLayout.truth

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Get the METHANE filter layout 
METHANE filter ID: -61504

METHANE filter name: "METHANE"

METHANE filter start sample: 1

METHANE filter start line: 291

METHANE filter start line: 285

METHANE filter samples: 1648

METHANE filter lines: 128
@@ -39,7 +39,7 @@ Get the METHANE filter layout but give it a different name 
METHANE filter ID: -61504

METHANE filter name: "methane"

METHANE filter start sample: 1

METHANE filter start line: 291

METHANE filter start line: 285

METHANE filter samples: 1648

METHANE filter lines: 128

isis/src/control/apps/deltack/deltack.cpp

+6 −3
Original line number Diff line number Diff line
@@ -267,12 +267,12 @@ void IsisMain() { 
      QObject::connect( bundleAdjust, SIGNAL( statusUpdate(QString) ),

                        bundleAdjust, SLOT( outputBundleStatus(QString) ) );



      BundleSolutionInfo bundleSolution = bundleAdjust->solveCholeskyBR();

      BundleSolutionInfo *bundleSolution = bundleAdjust->solveCholeskyBR();





      // Output bundle adjust files

      bundleSolution.outputText();

      bundleSolution.outputResiduals();

      bundleSolution->outputText();

      bundleSolution->outputResiduals();



      Table cmatrix = bundleAdjust->cMatrix(0);
@@ -285,6 +285,9 @@ void IsisMain() { 
      //cmatrix.Label().findObject("Table",Pvl::Traverse).addKeyword(description);



      c.write(cmatrix);

      

      delete bundleAdjust;

      delete bundleSolution;

    }



    // Now do final clean up as the update was successful if we reach here...

isis/src/control/apps/deltack/deltack.xml

+5 −1
Original line number Diff line number Diff line
@@ -190,7 +190,11 @@ 
      method to apply. The default is METHOD=BUNDLE which chooses pre-existing 

      behavor. Updated documentation to reflect these new changes. Fixes #4868. 

    </change>

    

    <change name="Ken Edmundson" date="2018-05-23">

      Modifed call to bundleAdjustment->solveCholeskyBR() to return a raw pointer to a

      BundleSolutionInfo object. Am also deleting this pointer because jigsaw.cpp takes

      ownership from BundleAdjust.

    </change>    

  </history>



  <groups>