Skip to content
Unverified Commit d9e91ffc authored by kledmundson's avatar kledmundson Committed by GitHub
Browse files

Adding Support for OSIRIS-REx TagCams Instruments (#5427)



* Add new IrregularBodyCameraGroundMap class

* Update documentation and app/unit tests

* Initial version of tagcams2isis

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Initial version of OREX TAGCAMS Camera Model

Provides initial version of OREX TAGCAMS camera model for NAVCam (Navcam 1), NFTCam (Navcam 2) and STOWCam instruments

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Improved import of TAGCAMS image data

tagcams2isis
* Added more keywords to import/translate
* Added option REMOVECALPIXELS to allow user to control how the boundary pixels are treated
* Implemented summing and scaling based upon expected conditions
* Add SourceProductId
* Compute CameraHeadTemperature (Celsius) from TCCHTEMP FITS label keyword for camera distortion model
* Compute and add YearDoy keyword

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Add complete version of OpenCV distortion model

* Added full implementation of the OpenCV 10 parameter distortion model for the TAGCAMS camera
* Allow selection of several models including OpenCV, OCAMS or none
* Added TOLERANCE parameter to determine convergence tolerance
* Added DEBUG_MODEL parameter to turn on print statements to debug the camera distortion model
* Added modified kernel DB file to support TAGCAMS along with OCAMS
* Updated TAGCAMS camera addendum file

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Modified OpenCV distortion model

OsirisRexTagcamsDistortionMap
* Renamed OpenCV parameters in the IAK kernel to better conform and associate with the OpenCV parameter names
* Added k4-k6 parameters to fully implement the OpenCV model

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Update TAGCAMS OpenCV distortion model parameters

orx_tagcams_addendum_v04.ti
* Version 4 of the TAGCAMS IAK kernel was created for new OpenCV distortion model parameters for Navcam 1 & 2

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Removed unused variables to suppress warnings

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Typo in iTime.h include

tagcams2isis
* Mistyped iTime.h with capital I - works on Macs, not Linux systems

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Removed apostrophe that causes problems on Linux

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Update tagcams2isis temperature computation

tagcams2isis
* Update b parameter used to convert raw DNs of camera head temperature to Celsius as provided by the NAV team in update to camera model

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Update TAGCAMS camera model

TAGCAMS Camera Model
* Now use the CCD center as specified in the IK as the focal plane detector map system origin
* Update camera model parameters provided by the NAV team
* Renamed conversion methods to more meaningful names
* Fixes pointing issues

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* New version of TAGCAMS camera model parameters

orex_tagcams_addendum_v05.ti
* Updated with all new TAGCAMS parameters as provided by the NAV/Kinetx team
* Added distortion model reference

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Updates to TAGCAMS IAK

orex_tagcams_addendum_v06.ti
* Added light time/stellar, abberation correction and target/observer swap parameters for each instrument
* Updated documentation

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Added LT and target/observer swap parameters

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Properly initialize distorted/undistorted parms

OsirisRexTagcamsDistortionMap
* Properly initialize distorted/undistorted parameters

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* tagams2isis.xml fix already happened

* Fixed merge issue

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Correct typo

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Minor documentation change

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>

* Modified for easy development of derived classes

Moved all private variables and methods to protected scope

* Added translations for OSIRIS-REx TagCams instruments NFTCam, NAVCam, and StowCam into Instruments.trn file. Originally added to University of Arizona codebase by Kris Becker on January 10, 2019. Addresses #5424.

* Committing test data for OsirisREx TagCams support. Addresses #5424.

* Initial commit of Osiris-REx Tagcams ingestion program tagcams2isis and supporting files. Addresses #5424.

* Adding support for intersections with irregular bodies, in particular to support Osiris-REx instruments. Addresses #5424.

* Unit test and truth data for OsirisREx tagcams instruments. Addresses #5424.

* Support for OsirisREx tagcams instruments. Addresses #5424.

* CHANGELOG entry for Osiris-REx tagcams instrument support. Addresses #5424.

* Per review comments 2024-03-18: 1) fixed typo in IrregularBodyGroundMap.h; 2) removed IrregularBodyGroundMap unit test; 3) replaced OsirisRexTagcamsCamera unit test with gtest version. Addresses #5424.

* Per Adam's suggestion 2024-03-19, modified second tagcams2isis method to take FileName object as an argument instead of a ProcessImportFits object. Addresses #5424.

---------

Signed-off-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>
Co-authored-by: default avatarKris J. Becker <kbecker@orex.lpl.arizona.edu>
Co-authored-by: default avatarKelvin Rodriguez <krodriguez@usgs.gov>
parent 35b21fc9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment