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

Reverted radii change to socetframesettings

parent ae9455b5

isis/src/socet/apps/socetframesettings/socetframesettings.cpp

+18 −39
Original line number Diff line number Diff line
@@ -419,28 +419,6 @@ void IsisMain() { 
    toStrm << "INS-" << ikCode << "_LT_SURFACE_CORRECT = '" << ltSurfaceCorrect <<"'\n";

  }



  // Add the target radii

  Distance targetRadii[3];

  if (cube.label()->hasGroup("Mapping")) {

    PvlGroup &mappingGroup = cube.label()->findGroup("Mapping");

    targetRadii[0].setMeters(toDouble(mappingGroup["EquatorialRadius"][0]));

    targetRadii[2].setMeters(toDouble(mappingGroup["PolarRadius"][0]));

  }

  else {

    try {

      cam->radii(targetRadii);

    }

    catch (IException &e) {

      QString msg = "Failed to get target body radii from cube.";

      throw IException(e, IException::Programmer, msg, _FILEINFO_);

    }

  }

  double eccentricity = 1.0 - (targetRadii[2].meters() * targetRadii[2].meters())

                            / (targetRadii[0].meters() * targetRadii[0].meters());

  eccentricity = sqrt(eccentricity);

  toStrm << "SEMI_MAJOR_AXIS  " << targetRadii[0].meters() <<"\n";

  toStrm << "ECCENTRICITY     " << eccentricity <<"\n";



} //End IsisMain
@@ -618,3 +596,4 @@ void getCamPosOPK(Spice &spice, QString spacecraftName, double et, Camera *cam, 
  

  return;

}

isis/src/socet/apps/socetframesettings/socetframesettings.xml

+7 −10
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ 
      Added support for OSIRIS-REx instrument and updated documentation to reflect the

      changes. Fixes #3898.

    </change>

    <change name="Jesse Mapel" date="2018-03-23">

      Added SEMI_MAJOR_AXIS and ECCENTRICITY to the output.

    </change>



</history>