Unverified Commit 65cef2ca authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Changes for de430 (#3283)

parent 93313217

isis/src/mer/apps/mical/main.cpp

+3 −2
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ void IsisMain() { 
  // Astronomical Units (AU)

  QString bspKernel = p.MissionData("base", "/kernels/spk/de???.bsp", true);

  furnsh_c(bspKernel.toLatin1().data());

  QString satKernel = p.MissionData("base", "/kernels/spk/mar???.bsp", true);

  furnsh_c(satKernel.toLatin1().data());

  QString pckKernel = p.MissionData("base", "/kernels/pck/pck?????.tpc", true);

  furnsh_c(pckKernel.toLatin1().data());

  double sunpos[6], lt;
@@ -97,6 +99,7 @@ void IsisMain() { 
  double kmperAU = 1.4959787066E8;

  gbl::sunAU = dist / kmperAU;

  unload_c(bspKernel.toLatin1().data());

  unload_c(satKernel.toLatin1().data());

  unload_c(pckKernel.toLatin1().data());
@@ -317,5 +320,3 @@ void helperButtonLogCalKernel() { 
  Application::GuiLog(OQString);

  Application::GuiLog(p);

}

isis/src/mer/apps/mical/mical.xml

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,10 @@ 
      Changed pvl.DIFF of input for all app tests to ignore file names. Allows test to pass when not

      using default data area. Fixes #4738.

    </change>

    <change name="Jesse Mapel" date="2019-05-15">

      Now loads latest Mars satellites kernel because the planets kernel (de430)

      only provides Mars Barycenter.

    </change>

  </history>



  <category>

isis/src/mgs/apps/moccal/main.cpp

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ void IsisMain() { 
  // Astronomical Units (AU)

  QString bspKernel = p.MissionData("base", "/kernels/spk/de???.bsp", true);

  furnsh_c(bspKernel.toLatin1().data());

  QString satKernel = p.MissionData("base", "/kernels/spk/mar???.bsp", true);

  furnsh_c(satKernel.toLatin1().data());

  QString pckKernel = p.MissionData("base", "/kernels/pck/pck?????.tpc", true);

  furnsh_c(pckKernel.toLatin1().data());

  double sunpos[6], lt;
@@ -141,6 +143,7 @@ void IsisMain() { 
  double kmPerAU = 1.4959787066E8;

  double sunAU = dist / kmPerAU;

  unload_c(bspKernel.toLatin1().data());

  unload_c(satKernel.toLatin1().data());

  unload_c(pckKernel.toLatin1().data());



  // See if the user wants counts/ms or i/f but if w0 is 0 then

isis/src/mgs/apps/moccal/moccal.xml

+28 −24
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ 
    <change name="Jeannie Walldren" date="2011-05-03">

      Removed Mgs namespace scope.

    </change>

    <change name="Jesse Mapel" date="2019-05-15">

      Now loads latest Mars satellites kernel because the planets kernel (de430)

      only provides Mars Barycenter.

    </change>

  </history>



  <category>

isis/src/mro/apps/ctxcal/ctxcal.xml

+14 −10
Original line number Diff line number Diff line
@@ -148,6 +148,10 @@ 
    <change name="Ian Humphrey" date="2014-06-23">

      Modified hard coded flatfile in app tests to relative paths using $ISIS3DATA. Fixes #2054.

    </change>

    <change name="Jesse Mapel" date="2019-05-15">

      Now loads latest Mars satellites kernel because the planets kernel (de430)

      only provides Mars Barycenter.

    </change>

  </history>



  <category>