Merge pull request #524 from kberryUSGS/tgo_frame_fix

Update CaSSIS camera to work correctly with ckwriter and jigsaw to output a non-zero exit status when the bundle does not converge, but update was set to yes. Fixes #5534 and #5522.

isis/src/control/apps/jigsaw/jigsaw.cpp

@@ -109,6 +109,8 @@ void IsisMain() {
     if (ui.GetBoolean("UPDATE") ) {
       if ( !bundleAdjustment->isConverged() ) {
         gp += PvlKeyword("Status","Bundle did not converge, camera pointing NOT updated");
+        QString msg = "Bundle did not converge within MAXITS [" + toString(ui.GetInteger("MAXITS")) + "] iterations [" + cnetFile +  "]";
+        throw IException(IException::Unknown, msg, _FILEINFO_);
       }
       else {
         for (int i = 0; i < bundleAdjustment->numberOfImages(); i++) {

isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp

@@ -66,7 +66,7 @@ namespace Isis {
     const PvlGroup &inst    = lab.findGroup("Instrument", Pvl::Traverse);
 
     // Set up the camera characteristics
-    instrumentRotation()->SetFrame( CkFrameId() );
+    instrumentRotation()->SetFrame(-143420);
     SetFocalLength();
     SetPixelPitch();
 
@@ -165,7 +165,7 @@ namespace Isis {
    *                Kernel Frame ID.
    */
   int TgoCassisCamera::CkFrameId() const {
-    return (-143420);
+    return (-143000);
   }