Unverified Commit e4a33097 authored by AustinSanders's avatar AustinSanders Committed by GitHub
Browse files

Adjusted frame NAIF frame ids (#4569) 



Co-authored-by: default avatarAustin Sanders <arsanders@ugs.gov>
parent cd092cfb

isis/src/clipper/apps/eis2isis/eis2isis.cpp

+3 −3
Original line number Diff line number Diff line
@@ -97,10 +97,10 @@ namespace Isis { 
      if (instrumentNameString == "EIS-NAC-RS") {

        // This ID will need to be updated. It is temporarily used for testing but is NOT the actual

        // NAC ID.

        kerns += PvlKeyword("NaifFrameCode", toString(-159011));

        kerns += PvlKeyword("NaifFrameCode", toString(-159101));

      }

      else if (instrumentNameString == "EIS-WAC-FC") {

        kerns += PvlKeyword("NaifFrameCode", toString(-159104));

        kerns += PvlKeyword("NaifFrameCode", toString(-159102));

      }

      else {

        QString msg = "Input file [" + xmlFileName.expanded() + "] has an invalid " +

isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ namespace Isis { 
   * @return int The appropriate instrument code for the "Camera-Matrix" Kernel Frame ID.

   */

  int ClipperNacRollingShutterCamera::CkFrameId() const {

    return (-159011);

    return (-159101);

  }

isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ namespace Isis { 
       * @return @b int The appropriate instrument code for the "Camera-matrix"

       *         Kernel Frame ID

       */

      virtual int CkFrameId() const { return (-159104); }

      virtual int CkFrameId() const { return (-159102); }





      /**

isis/tests/ClipperNacRollingShutterCameraTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ TEST_F(ClipperNacRsCube, ClipperNacRsCameraUnitTest) { 


  ClipperNacRollingShutterCamera *cam = (ClipperNacRollingShutterCamera *)testCube->camera();



  EXPECT_EQ(cam->CkFrameId(), -159011);

  EXPECT_EQ(cam->CkFrameId(), -159101);

  EXPECT_EQ(cam->CkReferenceId(), -159010);

  EXPECT_EQ(cam->SpkTargetId(), -159);

  EXPECT_EQ(cam->SpkReferenceId(), 1);

isis/tests/ClipperWacFcCameraTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ TEST_F(ClipperWacFcCube, ClipperWacFcCameraUnitTest) { 


  // Camera info

  //EXPECT_EQ(cam->instrumentRotation()->Frame(), -27002);    // from the defaultcube isd

  EXPECT_EQ(cam->CkFrameId(), -159104);

  EXPECT_EQ(cam->CkFrameId(), -159102);

  EXPECT_EQ(cam->CkReferenceId(), 1);

  EXPECT_EQ(cam->SpkTargetId(), -159);

  EXPECT_EQ(cam->SpkReferenceId(), 1);