Commit 120baa30 authored by Ken Edmundson's avatar Ken Edmundson Committed by Makayla Shepherd
Browse files

changes to SpiceRotation allowing partial derivatives for bundle in the case of a DYN ck

parent 1d52e820

isis/src/base/objs/SpiceRotation/SpiceRotation.cpp

+5 −3
Original line number Diff line number Diff line
@@ -1447,6 +1447,7 @@ namespace Isis { 
    QString msg;

    switch (m_frameType) {

     case CK:

     case DYN:

       dpoly = DPolynomial(coeffIndex);

       break;

     case PCK:
@@ -2035,7 +2036,7 @@ namespace Isis { 
   * @param[in]  partialVar  Variable derivative is to be with respect to

   * @param[in]  coeffIndex  Coefficient index in the polynomial fit to the variable (angle)

   *

   * @throws IException::Programmer "Only CK and PCK partials can be calculated"

   * @throws IException::Programmer "Only CK, DYN, and PCK partials can be calculated"

   *

   * @return @b vector<double> Vector rotated by derivative of J2000 to reference rotation.

   */
@@ -2062,13 +2063,14 @@ namespace Isis { 
    switch (m_frameType) {

     case UNKNOWN:  // For now let everything go through for backward compatability

     case CK:

     case DYN:

      dpoly = DPolynomial(coeffIndex);

       break;

     case PCK:

       dpoly = DPckPolynomial(partialVar, coeffIndex);

       break;

     default:

      QString msg = "Only CK and PCK partials can be calculated";

      QString msg = "Only CK, DYN, and PCK partials can be calculated";

      throw IException(IException::Programmer, msg, _FILEINFO_);

    }

isis/src/base/objs/SpiceRotation/SpiceRotation.h

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ namespace Isis { 
   *                           constants for a PCK type. 

   *   @history 2016-06-28 Ian Humphrey - Updated documentation and coding standards. Added new

   *                           tests to unit test. Fixes #3972.

   *   @history 2017-12-13 Ken Edmundson - Added "case DYN:" to methods ToReferencePartial and toJ2000Partial. Fixes #5251.

   *                           This problem was found when trying to bundle M3 images that had been spiceinited with nadir

   *                           pointing. The nadir frame is defined as a Dynamic Frame by Naif.

   *

   *  @todo Downsize using Hermite cubic spline and allow Nadir tables to be downsized again.

   *  @todo Consider making this a base class with child classes based on frame type or