Commit e9f9d93f authored by Jeannie Backer's avatar Jeannie Backer
Browse files

In jigsaw, changed default apriori sigma values from -1 to Isis::Null. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6068 41f8697f-d340-4b68-9986-7bafba869bb8
parent dee6be4d

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

+6 −5
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ BundleSettings bundleSettings(UserInterface &ui) { 
  settings.setValidateNetwork(true);



  // solve options

  double latitudeSigma  = -1.0;

  double longitudeSigma = -1.0;

  double radiusSigma    = -1.0;

  double latitudeSigma  = Isis::Null;

  double longitudeSigma = Isis::Null;

  double radiusSigma    = Isis::Null;

  if (ui.WasEntered("POINT_LATITUDE_SIGMA")) {

    latitudeSigma = ui.GetDouble("POINT_LATITUDE_SIGMA");

  }
@@ -220,7 +220,7 @@ QList<BundleObservationSolveSettings> observationSolveSettings(UserInterface &ui 
            ui.GetString("CAMSOLVE"));



    double anglesAprioriSigma, angularVelocityAprioriSigma, angularAccelerationAprioriSigma;

    anglesAprioriSigma = angularVelocityAprioriSigma = angularAccelerationAprioriSigma = -1.0;

    anglesAprioriSigma = angularVelocityAprioriSigma = angularAccelerationAprioriSigma = Isis::Null;

    if (ui.WasEntered("CAMERA_ANGLES_SIGMA")) {

      anglesAprioriSigma = ui.GetDouble("CAMERA_ANGLES_SIGMA");

    }
@@ -245,7 +245,8 @@ QList<BundleObservationSolveSettings> observationSolveSettings(UserInterface &ui 
            ui.GetString("SPSOLVE"));



    double positionAprioriSigma, positionVelocityAprioriSigma, positionAccelerationAprioriSigma;

    positionAprioriSigma = positionVelocityAprioriSigma = positionAccelerationAprioriSigma = -1.0;

    positionAprioriSigma = positionVelocityAprioriSigma = positionAccelerationAprioriSigma

                         = Isis::Null;

    if ( ui.WasEntered("SPACECRAFT_POSITION_SIGMA") ) {

      positionAprioriSigma = ui.GetDouble("SPACECRAFT_POSITION_SIGMA");

    }