From f17a899b0a85121ba166cb59af3132e15a28758f Mon Sep 17 00:00:00 2001 From: Kelvin Date: Mon, 22 Feb 2021 11:53:55 -0700 Subject: [PATCH 1/4] ctxcal now uses cam --- isis/src/mro/apps/ctxcal/main.cpp | 40 +++++++++++++++++++------------ 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/isis/src/mro/apps/ctxcal/main.cpp b/isis/src/mro/apps/ctxcal/main.cpp index 430cde041b..22b9b591a0 100644 --- a/isis/src/mro/apps/ctxcal/main.cpp +++ b/isis/src/mro/apps/ctxcal/main.cpp @@ -15,6 +15,7 @@ find files of those names at the top level of this repository. **/ #include "LineManager.h" #include "Brick.h" #include "Table.h" +#include "Camera.h" using namespace std; using namespace Isis; @@ -139,21 +140,30 @@ void IsisMain() { // iof = conversion factor from counts/ms to i/f bool convertIOF = ui.GetBoolean("IOF"); if(convertIOF) { - // Get the distance between Mars and the Sun at the given time in - // 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; - spkezr_c("sun", etStart, "iau_mars", "LT+S", "mars", sunpos, <); - double dist1 = vnorm_c(sunpos); - unload_c(bspKernel.toLatin1().data()); - unload_c(satKernel.toLatin1().data()); - unload_c(pckKernel.toLatin1().data()); - + double dist1 = 1; + try { + Camera *cam; + cam = icube->camera(); + cam->setTime(startTime); + dist1 = cam->sunToBodyDist(); + } + catch(IException &e) { + // Get the distance between Mars and the Sun at the given time in + // 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; + spkezr_c("sun", etStart, "iau_mars", "LT+S", "mars", sunpos, <); + dist1 = vnorm_c(sunpos); + unload_c(bspKernel.toLatin1().data()); + unload_c(satKernel.toLatin1().data()); + unload_c(pckKernel.toLatin1().data()); + } + double dist = 2.07E8; double w0 = 3660.5; double w1 = w0 * ((dist * dist) / (dist1 * dist1)); From 245e5121660e7be6a269860a7b272cdfd8beb8a6 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Mon, 22 Feb 2021 12:37:55 -0700 Subject: [PATCH 2/4] added checkerror calls --- isis/src/mro/apps/ctxcal/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/isis/src/mro/apps/ctxcal/main.cpp b/isis/src/mro/apps/ctxcal/main.cpp index 22b9b591a0..cf91c6f533 100644 --- a/isis/src/mro/apps/ctxcal/main.cpp +++ b/isis/src/mro/apps/ctxcal/main.cpp @@ -151,11 +151,15 @@ void IsisMain() { // Get the distance between Mars and the Sun at the given time in // Astronomical Units (AU) QString bspKernel = p.MissionData("base", "/kernels/spk/de???.bsp", true); + NaifStatus::CheckErrors(); furnsh_c(bspKernel.toLatin1().data()); + NaifStatus::CheckErrors(); QString satKernel = p.MissionData("base", "/kernels/spk/mar???.bsp", true); furnsh_c(satKernel.toLatin1().data()); + NaifStatus::CheckErrors(); QString pckKernel = p.MissionData("base", "/kernels/pck/pck?????.tpc", true); furnsh_c(pckKernel.toLatin1().data()); + NaifStatus::CheckErrors(); double sunpos[6], lt; spkezr_c("sun", etStart, "iau_mars", "LT+S", "mars", sunpos, <); dist1 = vnorm_c(sunpos); From 302bc5b1ba95ae39f44626bc33366d00be06c9ba Mon Sep 17 00:00:00 2001 From: Kelvin Date: Mon, 22 Feb 2021 22:47:27 -0700 Subject: [PATCH 3/4] removed some check status --- isis/src/mro/apps/ctxcal/main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/isis/src/mro/apps/ctxcal/main.cpp b/isis/src/mro/apps/ctxcal/main.cpp index cf91c6f533..43b93e0ba1 100644 --- a/isis/src/mro/apps/ctxcal/main.cpp +++ b/isis/src/mro/apps/ctxcal/main.cpp @@ -161,11 +161,17 @@ void IsisMain() { furnsh_c(pckKernel.toLatin1().data()); NaifStatus::CheckErrors(); double sunpos[6], lt; + spkezr_c("sun", etStart, "iau_mars", "LT+S", "mars", sunpos, <); + NaifStatus::CheckErrors(); + dist1 = vnorm_c(sunpos); + + NaifStatus::CheckErrors(); unload_c(bspKernel.toLatin1().data()); unload_c(satKernel.toLatin1().data()); unload_c(pckKernel.toLatin1().data()); + NaifStatus::CheckErrors(); } double dist = 2.07E8; From 835a03b37a5fd0af87e1f2f3a83970975d5c21df Mon Sep 17 00:00:00 2001 From: Kelvin Date: Tue, 23 Feb 2021 13:03:45 -0700 Subject: [PATCH 4/4] import NaifStatus --- isis/src/mro/apps/ctxcal/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/isis/src/mro/apps/ctxcal/main.cpp b/isis/src/mro/apps/ctxcal/main.cpp index 43b93e0ba1..f0ab8bdabd 100644 --- a/isis/src/mro/apps/ctxcal/main.cpp +++ b/isis/src/mro/apps/ctxcal/main.cpp @@ -16,6 +16,7 @@ find files of those names at the top level of this repository. **/ #include "Brick.h" #include "Table.h" #include "Camera.h" +#include "NaifStatus.h" using namespace std; using namespace Isis;