Unverified Commit 85d96b13 authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

Added error checking around spicelib furnsh call. Closes #4038 (#4115) 

* Added error checking around spicelib furnsh call to report error when kernels necessary for calibration where not available. Closes #4038

* Updated for #4038
parent 7fb2583a

CHANGELOG.md

+4 −1
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ update the Unreleased link so that it compares against the latest release tag. 


## [Unreleased]





- Fixed so required files are reported instead of continuing without them. [#4038](https://github.com/USGS-Astrogeology/ISIS3/issues/4038)



## [4.3.0] - 2020-10-02



### Changed

isis/src/lro/apps/lrowaccal/main.cpp

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "CubeAttribute.h"

#include "iTime.h"

#include "Message.h"

#include "NaifStatus.h"

#include "Preference.h"

#include "ProcessByBrick.h"

#include "PvlGroup.h"
@@ -206,14 +207,21 @@ void IsisMain () { 
        // Astronomical Units (AU)

        QString bspKernel1 = p.MissionData("lro", "/kernels/tspk/moon_pa_de421_1900-2050.bpc", false);

        QString bspKernel2 = p.MissionData("lro", "/kernels/tspk/de421.bsp", false);

        NaifStatus::CheckErrors();

        furnsh_c(bspKernel1.toLatin1().data());

        NaifStatus::CheckErrors();

        furnsh_c(bspKernel2.toLatin1().data());

        NaifStatus::CheckErrors();

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

        QString pckKernel2 = p.MissionData("lro", "/kernels/pck/moon_080317.tf", false);

        QString pckKernel3 = p.MissionData("lro", "/kernels/pck/moon_assoc_me.tf", false);

        NaifStatus::CheckErrors();

        furnsh_c(pckKernel1.toLatin1().data());

        NaifStatus::CheckErrors();

        furnsh_c(pckKernel2.toLatin1().data());

        NaifStatus::CheckErrors();

        furnsh_c(pckKernel3.toLatin1().data());

        NaifStatus::CheckErrors();

        double sunpos[6], lt;

        spkezr_c("sun", etStart, "MOON_ME", "LT+S", "MOON", sunpos, &lt);

        g_solarDistance = vnorm_c(sunpos) / KM_PER_AU;