Commit fdb24981 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Added support for CK based body frame

parent e70d885c

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

+187 −182
Original line number Diff line number Diff line
@@ -891,6 +891,11 @@ namespace Isis { 
            // Get the barycenter (bc) linear coefficients first (2 for each period).

            // Then we can get the maximum expected coefficients.

            SpiceInt bcCode = centerBodyCode/100;  // Ex: bc code for Jupiter (599) & its moons is 5

            // For comets, ID codes between 1000000 and 2000000, the precession terms just

            // use the body code.

            if (centerBodyCode > 1000000 && centerBodyCode < 2000000) {

              bcCode = centerBodyCode;

            }

            naifKeyword = "BODY" + toString(bcCode) + "_NUT_PREC_ANGLES" ;

            dtpool_c(naifKeyword.toLatin1().data(), &found, &numExpected, &naifType);

            std::vector<double>npAngles(numExpected, 0.);
@@ -3012,7 +3017,7 @@ namespace Isis { 
    frinfo_c(frameCode, &centerBodyCode, &frameClass, &classId, &found);



    if (found) {

      if (frameClass == 2  ||  centerBodyCode > 0) {

      if (frameClass == 2  ||  (centerBodyCode > 0 && frameClass != 3)) {

        m_frameType = PCK;

        // Load the PC information while it is available and set member values

        loadPCFromSpice(centerBodyCode);

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

+82 −77
Original line number Diff line number Diff line
@@ -209,6 +209,12 @@ namespace Isis { 
   *   @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.

   *   @history 2018-04-21 Jesse Mapel - Modified frametype resolution to check if a body centered

   *                           frame uses a CK or PCK definition. This only occurs for bodies

   *                           where a pck cannot accurately define for the duration of a mission.

   *                           The current example is the comet 67P/CHURYUMOV-GERASIMENKO

   *                           imaged by Rosetta. Some future comet/astroid missions are expected

   *                           to use a CK defined body fixed reference frame. Fixes #5408.

   *

   *  @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
@@ -591,4 +597,3 @@ namespace Isis { 
};



#endif