PROG Fixed checking for supporting old beta (b4b6d143) · Commits · aflab / astrogeology / ISIS3

isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@

		#include "NewHorizonsLorriCamera.h"

		#include <QString>

		#include "CameraDetectorMap.h"
		#include "CameraDistortionMap.h"
		#include "CameraFocalPlaneMap.h"
		@@ -48,6 +50,11 @@ namespace Isis {
		*/

		NewHorizonsLorriCamera::NewHorizonsLorriCamera(Cube &cube) : FramingCamera(cube) {
		m_instrumentNameLong = "Long Range Reconnaissance Imager";
		m_instrumentNameShort = "LORRI";
		m_spacecraftNameLong = "New Horizons";
		m_spacecraftNameShort = "NewHorizons";

		NaifStatus::CheckErrors();

		// The LORRI focal length is fixed and is designed not to change throught the operational

+11 −5

Original line number	Diff line number	Diff line
		@@ -22,9 +22,11 @@

		#include "FramingCamera.h"

		#include <QString>

		namespace Isis {
		/**
		* This is the camera model for the Dawn Framing Camera
		* This is the camera model for the LORRI Framing Camera
		*
		* @ingroup SpiceInstrumentsAndCameras
		* @ingroup New Horizons
		@@ -32,10 +34,15 @@ namespace Isis {
		* @author 2013-11-12 Stuart Sides
		*
		* @internal
		*
		* @history 2015-08-27 Stuart Sides - Modified to work with new Lorri IK with different units
		* @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods
		* to get spacecraft and instrument names. Extended unit test to test
		* added methods.
		* @history 2015-08-27 Stuart Sides - Modified to work with new Lorri IK with different unit
		* (mm) for the focal length. Incremented camera version to 2.
		*
		* @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument
		* members and methods and removed implementation of these methods
		* since Camera now handles this. References #2335.

		*/
		class NewHorizonsLorriCamera : public FramingCamera {
		public:
		@@ -84,7 +91,6 @@ namespace Isis {
		* Kernel Reference ID
		*/
		virtual int SpkReferenceId() const { return (1); }

		};
		};
		#endif

+7 −2

Original line number	Diff line number	Diff line
		@@ -8,6 +8,11 @@ CK Reference ID = 1
		SPK Target ID = -98
		SPK Reference ID = 1

		Spacecraft Name Long: New Horizons
		Spacecraft Name Short: NewHorizons
		Instrument Name Long: Long Range Reconnaissance Imager
		Instrument Name Short: LORRI

		Shutter open = 225787161.551337481
		Shutter close = 225787161.551341474

		@@ -28,5 +33,5 @@ DeltaSample = 0.000000000
		DeltaLine = 0.000000000

		For center pixel position ...
		Latitude OK
		Longitude OK
		Latitude off by: 0.0255589466259298
		Longitude off by: 0.0032366246724109

+4 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,10 @@ namespace Isis {
		* @history 2014-06-08 Staurt Sides - Original version. Equations and coefficients
		* taken from Jet Propulsion Laboratory Interoffice Memorandum 2011/06/08 "New Horizons
		* LORRI Geometric Calibration of August 2006" From: W. M. Owen Jr. and D. O'Coonnell
		*
		* @history 2016-02-24 Staurt Sides - New Horizons LORRI distortion model changed to
		* subtract the distortion when going from distorted to undistorted instead of adding, and
		* adding the distortion when going from undistorted to destorted.
		*/
		class NewHorizonsLorriDistortionMap : public CameraDistortionMap {
		public:

+6 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ int main(void) {
		cout << "SPK Target ID = " << cam->SpkTargetId() << endl;
		cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl;

		// Test name methods
		cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl;
		cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl;
		cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl;
		cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl;

		// Test Shutter Open/Close
		const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse);
		double exposureDuration = ((double) inst["ExposureDuration"])/1000;