updates for unit tests

DOI-USGS · Aug 17, 2020 · b8b9ba9 · b8b9ba9
1 parent d776c72
commit b8b9ba9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/isis/src/base/objs/SpicePosition/SpicePosition.cpp b/isis/src/base/objs/SpicePosition/SpicePosition.cpp
@@ -1286,23 +1286,21 @@ namespace Isis {
    *            method)
    */
   void SpicePosition::SetEphemerisTimeMemcache() {
-
+    ale::State state;
+    if (cacheSize() == 1) {
+      state = m_state->getStates().front();
+    }
+    else {
+      state = m_state->getState(p_et, ale::LINEAR);
+    }
+    p_coordinate[0] = state.position.x;
+    p_coordinate[1] = state.position.y;
+    p_coordinate[2] = state.position.z;
     if (p_hasVelocity){
-      ale::State state = m_state->getState(p_et, ale::LINEAR);
-      p_coordinate[0] = state.position.x;
-      p_coordinate[1] = state.position.y;
-      p_coordinate[2] = state.position.z;
-
       p_velocity[0] = state.velocity.x;
       p_velocity[1] = state.velocity.y;
       p_velocity[2] = state.velocity.z;
     }
-    else{
-      ale::Vec3d position = m_state->getPosition(p_et, ale::LINEAR);
-      p_coordinate[0] = position.x;
-      p_coordinate[1] = position.y;
-      p_coordinate[2] = position.z;
-    }
   }
 
 

diff --git a/isis/src/control/apps/jigsaw/tsts/camsolveAll/Makefile b/isis/src/control/apps/jigsaw/tsts/camsolveAll/Makefile
@@ -23,7 +23,7 @@ commands:
 	  update=yes \
 	  cksolvedegree=3 \
 	  camsolve=all \
-	  bundleout_txt=no \
+	  bundleout_txt=yes \
 	  twist=no > /dev/null;
 	# The above command uses sed to do the following (in order):
 	# 1. remove cube filename paths

diff --git a/isis/src/juno/objs/JunoCamera/unitTest.cpp b/isis/src/juno/objs/JunoCamera/unitTest.cpp
@@ -53,8 +53,8 @@ int main(void) {
     // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera,
     // set both the known lat and known lon to zero and copy the unit test output
     // "Latitude off by: " and "Longitude off by: " values directly into these variables.
-    double knownLat = -45.4762320380959295;
-    double knownLon = 278.270465938390657;
+    double knownLat = -45.4752919757178731;
+    double knownLon = 278.267811512381911;
 
     Cube c("$juno/testData/JNCE_2013282_00M00099_V01_METHANE_0003.cub", "r");
     JunoCamera *cam = (JunoCamera *) CameraFactory::Create(c);