Set CKReferenceID and SpkReferenceId to J2000 (1) to resolve a problem with... (03cddad5) · Commits · aflab / astrogeology / ISIS3

isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ namespace Isis {
		* @internal
		* @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods.
		* @history 2011-05-03 Jeannie Walldren - Added documentation.
		* @history 2014-01-17 Kris Becker - Set CkReferenceID to J2000 to resolve
		* problem with ckwriter
		*/
		ApolloMetricCamera::ApolloMetricCamera(Cube &cube) : FramingCamera(cube) {
		NaifStatus::CheckErrors();
		@@ -79,17 +81,17 @@ namespace Isis {
		QString spacecraft = inst.findKeyword("SpacecraftName")[0];
		if (spacecraft.contains("15")) {
		p_ckFrameId = -915240;
		p_ckReferenceId = 1400015;
		p_ckReferenceId = 1;
		p_spkTargetId = -915;
		}
		else if (spacecraft.contains("16")) {
		p_ckFrameId = -916240;
		p_ckReferenceId = 1400016;
		p_ckReferenceId = 1;
		p_spkTargetId = -916;
		}
		else if (spacecraft.contains("17")) {
		p_ckFrameId = -917240;
		p_ckReferenceId = 1400017;
		p_ckReferenceId = 1;
		p_spkTargetId = -917;
		}
		else {

+12 −5

Original line number	Diff line number	Diff line
		@@ -49,6 +49,9 @@ namespace Isis {
		* to files.
		* @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis
		* coding standards. References #972.
		* @history 2014-01-17 Kris Becker - Set CkReferenceID to J2000 to resolve
		* problem with ckwriter. Also, set the SpkReferenceId
		* to J2000. References #1737 and #1739.
		*/
		class ApolloMetricCamera : public FramingCamera {
		public:
		@@ -71,9 +74,9 @@ namespace Isis {

		/**
		* CK Reference ID -
		* APOLLO_15_NADIR = 1400015
		* APOLLO_16_NADIR = 1400016
		* APOLLO_17_NADIR = 1400017
		* APOLLO_15_NADIR = 1
		* APOLLO_16_NADIR = 1
		* APOLLO_17_NADIR = 1
		*
		* @return @b int The appropriate instrument code for the "Camera-matrix" Kernel
		* Reference ID
		@@ -92,12 +95,16 @@ namespace Isis {
		virtual int SpkTargetId() const { return p_spkTargetId; }

		/**
		* SPK Reference ID - B1950
		* SPK Reference ID - J2000
		*
		* Even thought the ephemeris is relative to B1950, this specification
		* is for writing SPK kernels. We should stay with the J2000 epoch in
		* these cases.
		*
		* @return @b int The appropriate instrument code for the Spacecraft
		* Kernel Reference ID,
		*/
		virtual int SpkReferenceId() const { return (2); }
		virtual int SpkReferenceId() const { return (1); }

		private:
		int p_ckFrameId; //!< "Camera-matrix" Kernel Frame ID

+2 −2