Skip to content

Commit

Permalink
Fixes GroundMap, SkyMap in Kaguya TC Camera Model and improve Focal M…
Browse files Browse the repository at this point in the history
…ap Origin (#3220)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable
  • Loading branch information
krlberry authored and scsides committed Apr 11, 2019
1 parent 666848a commit 3d6b8c1
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include "LineScanCameraDetectorMap.h"
#include "CameraDistortionMap.h"
#include "CameraFocalPlaneMap.h"
#include "CameraGroundMap.h"
#include "CameraSkyMap.h"
#include "LineScanCameraGroundMap.h"
#include "LineScanCameraSkyMap.h"
#include "IException.h"
#include "IString.h"
#include "iTime.h"
Expand Down Expand Up @@ -71,8 +71,9 @@ namespace Isis {

// 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( 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(
Spice::getDouble("INS" + toString(naifIkCode()) +
Expand All @@ -84,8 +85,8 @@ namespace Isis {
new KaguyaTcCameraDistortionMap(this, naifIkCode());

// Setup the ground and sky map
new CameraGroundMap(this);
new CameraSkyMap(this);
new LineScanCameraGroundMap(this);
new LineScanCameraSkyMap(this);

setTime(time);
LoadCache();
Expand Down

0 comments on commit 3d6b8c1

Please sign in to comment.