From 0ba7cda8ffe3ffab4d94adeeb824bf023727f7c6 Mon Sep 17 00:00:00 2001 From: ssides Date: Sun, 8 Nov 2020 19:05:25 -0700 Subject: [PATCH 1/2] Added error checking around spicelib furnsh call to report error when kernels necessary for calibration where not available. Closes #4038 --- isis/src/lro/apps/lrowaccal/main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/isis/src/lro/apps/lrowaccal/main.cpp b/isis/src/lro/apps/lrowaccal/main.cpp index 6e3faf2078..d3407ba3a4 100644 --- a/isis/src/lro/apps/lrowaccal/main.cpp +++ b/isis/src/lro/apps/lrowaccal/main.cpp @@ -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, <); g_solarDistance = vnorm_c(sunpos) / KM_PER_AU; From 2275ac48f666f0df94a6ccc3e896e2f33e30ed06 Mon Sep 17 00:00:00 2001 From: ssides Date: Sun, 8 Nov 2020 19:16:19 -0700 Subject: [PATCH 2/2] Updated for #4038 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d05ebcee7a..c5fa69c684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -48,7 +51,7 @@ update the Unreleased link so that it compares against the latest release tag. - mro/hideal2pds app now writes the correct SAMPLE_BIT_MASK values to the output label. [#3978](https://github.com/USGS-Astrogeology/ISIS3/issues/3978) - - For Histograms in ISIS, updated the math for calculating what bin data should be placed in and the min/max values of each bin to be more intuitive. In addition, the output of hist and cnethist were changed to display the min/max values of each bin instead of the middle pixel's DN. [#3882](https://github.com/USGS-Astrogeology/ISIS3/issues/3882) + - For Histograms in ISIS, updated the math for calculating what bin data should be placed in and the min/max values of each bin to be more intuitive. In addition, the output of hist and cnethist were changed to display the min/max values of each bin instead of the middle pixel's DN. [#3882](https://github.com/USGS-Astrogeology/ISIS3/issues/3882) ### Added