Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update of Existing OSIRIS-REx OCams Instrument Support #5718

Open
wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

Update of Existing OSIRIS-REx OCams Instrument Support #5718

wants to merge 8 commits into from

Conversation

kledmundson
Copy link
Contributor

Description

Updating existing support for OSIRIS-REx OCams instruments (MapCam, PolyCam, and SamCam) to reflect the current state in the U. of Arizona code base. Includes...

  1. conversion of ocams2isis app to callable function
  2. ctest for ocams2isis
  3. conversion of ocams Makefile category tests to ctest module tests
  4. deletion of existing ocams category Makefile tests
  5. ocams fits files added to isis test data (2 each for poly, map, samcam)
  6. updates to ocams camera fixture tests
  7. ocams addendum kernels v10, v12 added to OsirisRexOcamsCamera/asset folder
  8. Update tagcams serial number translation file to match that of ocams

Related Issue

#5426

How Has This Been Validated?

Ocams Makefile category tests have been converted to ctest module tests with updated images and tests. All new and existing OSIRIS-REx tests passing.

ctest suite results...

Start 1164: TempTestingFiles.UnitTestOsirisRexTagCamsNAVCam
1/23 Test #1164: TempTestingFiles.UnitTestOsirisRexTagCamsNAVCam ........... Passed 1.27 sec
Start 1165: TempTestingFiles.UnitTestOsirisRexTagCamsNFTCam
2/23 Test #1165: TempTestingFiles.UnitTestOsirisRexTagCamsNFTCam ........... Passed 0.89 sec
Start 2294: OsirisRexMapCamModules.MapCamModuleExplodeReuniteTest
3/23 Test #2294: OsirisRexMapCamModules.MapCamModuleExplodeReuniteTest ..... Passed 11.40 sec
Start 2295: OsirisRexMapCamModules.MapCamModuleAlgebraTest
4/23 Test #2295: OsirisRexMapCamModules.MapCamModuleAlgebraTest ............ Passed 1.11 sec
Start 2296: OsirisRexMapCamModules.MapCamModuleInfoAndStatsTest
5/23 Test #2296: OsirisRexMapCamModules.MapCamModuleInfoAndStatsTest ....... Passed 22.65 sec
Start 2297: OsirisRexMapCamModules.MapCamModuleCamptTest
6/23 Test #2297: OsirisRexMapCamModules.MapCamModuleCamptTest .............. Passed 3.92 sec
Start 2298: OsirisRexMapCamModules.MapCamModuleTwoImageTest
7/23 Test #2298: OsirisRexMapCamModules.MapCamModuleTwoImageTest ........... Passed 62.60 sec
Start 2299: OsirisRexOcamsCube.PolyMath
8/23 Test #2299: OsirisRexOcamsCube.PolyMath ............................... Passed 1.56 sec
Start 2300: OsirisRexOcamsCube.MappingCam
9/23 Test #2300: OsirisRexOcamsCube.MappingCam ............................. Passed 1.56 sec
Start 2301: OsirisRexOcamsCube.SamplingCam
10/23 Test #2301: OsirisRexOcamsCube.SamplingCam ............................ Passed 1.56 sec
Start 2302: OsirisRexOcamsCube.PolyCamUpdatedIkCodes
11/23 Test #2302: OsirisRexOcamsCube.PolyCamUpdatedIkCodes .................. Passed 1.55 sec
Start 2303: OsirisRexPolyCamModules.PolyCamModuleExplodeReuniteTest
12/23 Test #2303: OsirisRexPolyCamModules.PolyCamModuleExplodeReuniteTest ... Passed 9.42 sec
Start 2304: OsirisRexPolyCamModules.PolyCamModuleAlgebraTest
13/23 Test #2304: OsirisRexPolyCamModules.PolyCamModuleAlgebraTest .......... Passed 1.09 sec
Start 2305: OsirisRexPolyCamModules.PolyCamModuleInfoAndStatsTest
14/23 Test #2305: OsirisRexPolyCamModules.PolyCamModuleInfoAndStatsTest ..... Passed 22.31 sec
Start 2306: OsirisRexPolyCamModules.PolyCamModuleCamptTest
15/23 Test #2306: OsirisRexPolyCamModules.PolyCamModuleCamptTest ............ Passed 3.90 sec
Start 2307: OsirisRexPolyCamModules.PolyCamModuleTwoImageTest
16/23 Test #2307: OsirisRexPolyCamModules.PolyCamModuleTwoImageTest ......... Passed 30.35 sec
Start 2308: OsirisRexSamCamModules.SamCamModuleExplodeReuniteTest
17/23 Test #2308: OsirisRexSamCamModules.SamCamModuleExplodeReuniteTest ..... Passed 9.55 sec
Start 2309: OsirisRexSamCamModules.SamCamModuleAlgebraTest
18/23 Test #2309: OsirisRexSamCamModules.SamCamModuleAlgebraTest ............ Passed 1.08 sec
Start 2310: OsirisRexSamCamModules.SamCamModuleInfoAndStatsTest
19/23 Test #2310: OsirisRexSamCamModules.SamCamModuleInfoAndStatsTest ....... Passed 22.51 sec
Start 2311: OsirisRexSamCamModules.SamCamModuleCamptTest
20/23 Test #2311: OsirisRexSamCamModules.SamCamModuleCamptTest .............. Passed 3.91 sec
Start 2312: OsirisRexSamCamModules.SamCamModuleTwoImageTest
21/23 Test #2312: OsirisRexSamCamModules.SamCamModuleTwoImageTest ........... Passed 23.96 sec
Start 2313: OsirisRexTagcamsNAVCamCube.NavigationCam
22/23 Test #2313: OsirisRexTagcamsNAVCamCube.NavigationCam .................. Passed 2.80 sec
Start 2314: OsirisRexTagcamsNFTCamCube.NaturalFeatureTrackingCam
23/23 Test #2314: OsirisRexTagcamsNFTCamCube.NaturalFeatureTrackingCam ...... Passed 2.77 sec

100% tests passed, 0 tests failed out of 23

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have added myself to the .zenodo.json document.
  • I have added my user impacting change to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

KrisBecker and others added 8 commits January 22, 2025 14:47
@KrisBecker @kledmundson
Add OpenCV distortion Model to OCAMS. Addresses DOI-USGS#5426.
7907557 
* Added the OpenCV distortion model to the OSIRIS-REx OCAMS camera model. This distortion model is based upon the TAGCAMS OpenCV model implementation.

Signed-off-by: Kris J. Becker <[email protected]>
@KrisBecker @kledmundson
Add new version of OCAMS distortion parameters
8eaaf69 
orex_ocams_addendum_v07.ti - Added new OCAMS distortion model parameters derived for 94 of the 117 PolyCam focus positions. With these new parameters, the OCAMS distortion algorithm is preferred over the OpenCV algorithm. It was installed in the ISIS3 processing system on 2019-09-04

Signed-off-by: Kris J. Becker <[email protected]>
@KrisBecker @kledmundson
Updated focal lengths for OCAMS distortions
b5f0bc2 
orex_ocams_addendum_v08.ti - The focal lenght updates for each of the 94 OCAMS distortion parameters where inadvertanty left out of the previous version v07. This update adds the individual INS-XXXXX_FOCAL_LENGTH parameter for each of the 94 focus positions. Installed 2019-10-21.

Signed-off-by: Kris J. Becker <[email protected]>
@KrisBecker @kledmundson
Update to ORX OCAMS SamCam Distortion Mdle
67f0edb 
orex_ocams_addendum_v09.ti - Add OCAMS SamCam distortion model developed by C. d’Aubigny (2020-02-17).

Signed-off-by: Kris J. Becker <[email protected]>
@kledmundson
Update of existing support for OSIRIS-REx OCams instruments (MapCam, …
32abc3e 
…PolyCam, and SamCam) needs to reflect the current state in the U. of Arizona code base. Addresses DOI-USGS#5426. Includes...

     1) conversion of ocams2isis app to callable function
     2) ctest for ocams2isis
     3) updates to OCamsCamera and OsirisRexDistortionMap
     4) conversion of ocams Makefile category tests to ctest module tests
     5) deletion of ocams category Makefile tests
     6) Addition of 2 ocams fits file each for poly, map, and samcam instruments to isis data area
     7) updates to ocams camera fixture tests
@kledmundson
Update to tagcams serial number translation file to match that of oca…
4dbf19d 
…ms. Addresses DOI-USGS#5426.
@kledmundson
Added change log entry for ocams instrument support update. Addresses D…
164aac6 
…OI-USGS#5426.
@kledmundson
Merge branch 'DOI-USGS:dev' into enhancement/ocamsUpdate
a2685ac
@github-actions GitHub Actions
Copy link

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5718".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

@Kelvinrr Kelvinrr self-requested a review January 31, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kelvinrr Kelvinrr Awaiting requested review from Kelvinrr

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kledmundson @KrisBecker