Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moccal now uses Camera for calib #4311

Merged
merged 2 commits into from
Feb 24, 2021
Merged

moccal now uses Camera for calib #4311

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77709b6
moccal now uses Camera for calib
Feb 23, 2021
1a11f48
removed prints
Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions isis/src/mgs/apps/moccal/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ find files of those names at the top level of this repository. **/
#include "IException.h"
#include "TextFile.h"
#include "LineManager.h"
#include "NaifStatus.h"
#include "Camera.h"

using namespace std;
using namespace Isis;
Expand Down Expand Up @@ -119,22 +121,42 @@ void IsisMain() {
#endif
gbl::nullWago = ui.GetBoolean("NULLWAGO");

// 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, &lt);
double dist = vnorm_c(sunpos);
double kmPerAU = 1.4959787066E8;
double sunAU = dist / kmPerAU;
unload_c(bspKernel.toLatin1().data());
unload_c(satKernel.toLatin1().data());
unload_c(pckKernel.toLatin1().data());
double sunAU = 0;
try {
Camera *cam;
cam = icube->camera();
cam->setTime(startTime);
sunAU = cam->sunToBodyDist() / kmPerAU;

std::cout << "from Camera: " << sunAU << std::endl;
Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved
}
catch(IException &e) {
// Get the distance between Mars and the Sun at the given time in
// Astronomical Units (AU)

NaifStatus::CheckErrors();
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());
NaifStatus::CheckErrors();

double sunpos[6], lt;
spkezr_c("sun", etStart, "iau_mars", "LT+S", "mars", sunpos, &lt);
double dist = vnorm_c(sunpos);
sunAU = dist / kmPerAU;

NaifStatus::CheckErrors();
unload_c(bspKernel.toLatin1().data());
unload_c(satKernel.toLatin1().data());
unload_c(pckKernel.toLatin1().data());
NaifStatus::CheckErrors();

std::cout << "from spice: " << sunAU << std::endl;
Kelvinrr marked this conversation as resolved.
Show resolved Hide resolved
}

// See if the user wants counts/ms or i/f but if w0 is 0 then
// we must go to counts/ms
Expand Down