Adding Support for OSIRIS-REx TagCams Instruments (#5427) (d9e91ffc) · Commits · aflab / astrogeology / ISIS3

CHANGELOG.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ release.
		- Changed the default spiceinit url to https://astrogeology.usgs.gov/apis/ale/v0.9.1/spiceserver/ and added deprecation warning for use of https://services.isis.astrogeology.usgs.gov/cgi-bin/spiceinit.cgi url. [#5327](https://github.com/USGS-Astrogeology/ISIS3/issues/5327)
		- Skypt has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5443](https://github.com/USGS-Astrogeology/ISIS3/issues/5443)


		### Fixed
		- Fixed a bug in which the histogram tool used the entire image to calculate bin size, which caused an issue with high dynamic range images. [#5371](https://github.com/DOI-USGS/ISIS3/issues/5371)
		- Fixed a bug in which 'version' file was compiled as source and prevented subsequent ISIS recompilation [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)
		@@ -56,6 +55,7 @@ release.
		- Added new option in `ctxcal` to use monthly computed flatfield files for "Frown" removal in CTX images. [#5338](https://github.com/DOI-USGS/ISIS3/pull/5338)
		- CSMCamera can now read and use the body rotation from ALE produced ISDs [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)
		- CSMSkyMap added to CSMCamera for use with local rover projections in ISIS [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)
		- OSIRIS-REx Tagcams instrument support, tests, and test data added [#5424](https://github.com/DOI-USGS/ISIS3/issues/5424)


		## [8.1.0] - 2024-01-08

isis/appdata/serialnumbers/OsirisRexTagCamsSerialNumber.trn

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		# history 2019-01-19 Kris Becker - Original version added to UofA codebase.

		Group = Keyword1
		Auto
		InputKey = SpacecraftName
		InputGroup = "IsisCube,Instrument"
		InputPosition = (IsisCube, Instrument)
		OutputName = Keyword1
		OutputPosition = ("Group","SerialNumberKeywords")
		Translation = ("OsirisRex", "OSIRIS-REx")
		Translation = (,)
		EndGroup
		Group = Keyword2
		Auto
		InputKey = InstrumentId
		InputGroup = "IsisCube,Instrument"
		InputPosition = (IsisCube, Instrument)
		OutputName = Keyword2
		OutputPosition = ("Group","SerialNumberKeywords")
		Translation = (,)
		EndGroup
		Group = Keyword3
		Auto
		InputKey = SpacecraftClockStartCount
		InputGroup = "IsisCube,Instrument"
		InputPosition = (IsisCube, Instrument)
		OutputName = Keyword3
		OutputPosition = ("Group","SerialNumberKeywords")
		Translation = (,)
		EndGroup

isis/appdata/translations/Instruments.trn

+4 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,10 @@ Group = InstrumentName
		Translation = (OCams, SamCam)
		Translation = (OCams, PolyCam)

		Translation = (TagCams, NAVCam)
		Translation = (TagCams, NFTCam)
		Translation = (TagCams, StowCam)

		# Rosetta
		Translation = (Osiris, OSINAC)
		Translation = (Osiris, OSIWAC)

isis/src/base/objs/CameraGroundMap/CameraGroundMap.h

+4 −1

Original line number	Diff line number	Diff line
		#ifndef CameraGroundMap_h
		#define CameraGroundMap_h

		/** This is free and unencumbered software released into the public domain.
		The authors of ISIS do not claim copyright on the contents of this file.
		For more details about the LICENSE terms and the AUTHORS, you will
		@@ -69,6 +70,9 @@ namespace Isis {
		* allow the bundle adjustment to skip the back of planet test during iterations.
		* Also changed the name of the angle variable to cosangle to be more
		* descriptive. References #2591.
		* @history 2018-07-26 Kris Becker - Move all local variables and methods to
		* protected scope so derived objects can be developed
		* properly
		*/
		class CameraGroundMap {
		public:
		@@ -135,7 +139,6 @@ namespace Isis {
		double p_focalPlaneX; //!< Camera's x focal plane coordinate
		double p_focalPlaneY; //!< Camera's y focal plane coordinate

		private:
		void LookCtoFocalPlaneXY(); //!< Calculate focalplane x/y from lookvector in camera
		/** Surface point calculated from ground coordinates in GetXY and used for partials*/
		std::vector<double> m_pB;

isis/src/base/objs/IrregularBodyCameraGroundMap/IrregularBodyCameraGroundMap.cpp

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/** This is free and unencumbered software released into the public domain.
		The authors of ISIS do not claim copyright on the contents of this file.
		For more details about the LICENSE terms and the AUTHORS, you will
		find files of those names at the top level of this repository. **/

		/* SPDX-License-Identifier: CC0-1.0 */

		#include "IrregularBodyCameraGroundMap.h"

		#include "SurfacePoint.h"

		using namespace std;

		namespace Isis {

		/**
		* Constructor
		*
		* @param parent Pointer to camera to be used for mapping with ground
		*/
		IrregularBodyCameraGroundMap::IrregularBodyCameraGroundMap(Camera *parent,
		const bool clip_emission_angles) : CameraGroundMap(parent),
		m_clip_emission(clip_emission_angles) {
		}

		/**
		* This method computes the undistorted focal plane coordinates for a ground
		* position, using the current Spice settings (time and kernels) without
		* resetting the current point values for lat/lon/radius/x/y. The class value
		* value for m_pB and m_lookJ are set by this method.
		*
		* This method has been reimplemented from the CameraGroundMap class to never
		* perform the emission angle check. This is because it uses the ellipsoid for
		* the check which is in general not adequate for irregular bodies.
		*
		* @param point Surface point (ground position)
		* @param cudx [out] Pointer to computed undistored x focal plane coordinate
		* @param cudy [out] Pointer to computed undistored y focal plane coordinate
		*
		* @return @b bool If conversion was successful
		*/
		bool IrregularBodyCameraGroundMap::GetXY(const SurfacePoint &point,
		double cudx, double cudy) {

		return CameraGroundMap::GetXY(point, cudx, cudy, m_clip_emission);
		}
		}