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

Update Kaguya TC Camera model to use LineScan Camera detector map #3218

Merged
merged 6 commits into from
Apr 9, 2019
Merged

Update Kaguya TC Camera model to use LineScan Camera detector map #3218

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d49a47c
Initial distortion model changes
krlberry Apr 5, 2019
91f0211
Distortion model updates to actually match equation in documentation
krlberry Apr 8, 2019
d244187
Update truthdata for sensor model
krlberry Apr 8, 2019
5c1f405
Switch Kaguya TC to use L/S camera detector map. It is not a framer!
krlberry Apr 9, 2019
a288a86
Fix typo
krlberry Apr 9, 2019
c6a7fb1
Merge branch 'kaguyatc' of github.com:USGS-Astrogeology/ISIS3 into ka…
krlberry Apr 9, 2019
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
8 changes: 6 additions & 2 deletions isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include <QString>

#include "CameraDetectorMap.h"
#include "LineScanCameraDetectorMap.h"
#include "CameraDistortionMap.h"
#include "CameraFocalPlaneMap.h"
#include "CameraGroundMap.h"
Expand Down Expand Up @@ -61,13 +61,17 @@ namespace Isis {
double time = iTime((QString)inst["StartTime"]).Et();

// divide exposure duration keyword value by 1000 to convert to seconds
// needed?
double exposureDuration = ((double) inst["ExposureDuration"]) / 1000.0;

// Setup detector map
new CameraDetectorMap(this);
double lineRate = (double) inst["LineSamplingInterval"] / 1000.0;

new LineScanCameraDetectorMap(this, time, lineRate);

// Setup focal plane map
CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
// focalMap->SetDetectorOrigin( Samples() / 2.0 + 0.5, 1.0); //Lines() / 2.0 + 0.5);
focalMap->SetDetectorOrigin( Samples() / 2.0 + 0.5, Lines() / 2.0 + 0.5);
/*
focalMap->SetDetectorOrigin(
Expand Down