Update of Existing OSIRIS-REx OCams Instrument Support#5718
Update of Existing OSIRIS-REx OCams Instrument Support#5718acpaquette merged 15 commits intoDOI-USGS:devfrom
Conversation
* 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 <kbecker@orex.lpl.arizona.edu>
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 <kbecker@orex.lpl.arizona.edu>
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 <kbecker@orex.lpl.arizona.edu>
orex_ocams_addendum_v09.ti - Add OCAMS SamCam distortion model developed by C. d’Aubigny (2020-02-17). Signed-off-by: Kris J. Becker <kbecker@orex.lpl.arizona.edu>
…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
|
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. |
|
Hi @kledmundson, there are a few test failures in the build logs: |
|
Thanks, on it.
…On Tue, Feb 25, 2025 at 15:23 Adam Paquette ***@***.***> wrote:
Hi @kledmundson <https://github.com/kledmundson>, there are a few test
failures in the build logs:
785 - socetframesettings_app_test_orexMapCam (Failed)
786 - socetframesettings_app_test_orexPolyCam (Failed)
2131 - Phocube.FunctionalTestPhocubeSunIlluminationMask (Failed)
2132 - Phocube.FunctionalTestPhocubeSurfaceObliqueDetectorResolution
(Failed)
2296 - OsirisRexMapCamModules.MapCamModuleTwoImageTest (Failed)
2305 - OsirisRexPolyCamModules.PolyCamModuleTwoImageTest (Failed)
2310 - OsirisRexSamCamModules.SamCamModuleTwoImageTest (Failed)
See here
<https://us-west-2.codebuild.aws.amazon.com/project/eyJlbmNyeXB0ZWREYXRhIjoiNDJNZ2MxbHFKTkwxV1RyQUxJekdJY3FIanNqU29rMHB4Nk1YUzk4REIrZUZDeEtEaW9HQlZ1dTZOSHpML2VUTGVDekYydmVFcU9sUHJKN20wQzd1Q0UzSzJscnB0MElDb1M3Ti9GTlJYR1RuMWJTV3V1SkJTa3NoYmc9PSIsIml2UGFyYW1ldGVyU3BlYyI6IjF3U2NTSGlDcEtCc29YVnEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D/build/59775ba9-ed6a-4be3-9599-8b81d7936355>
for more details
—
Reply to this email directly, view it on GitHub
<#5718 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABUGSUTS3RAM36LGPEFU32T2RTUN7AVCNFSM6AAAAABWEDZ2BCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDMOBTGQZDSMRZGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
[image: acpaquette]*acpaquette* left a comment (DOI-USGS/ISIS3#5718)
<#5718 (comment)>
Hi @kledmundson <https://github.com/kledmundson>, there are a few test
failures in the build logs:
785 - socetframesettings_app_test_orexMapCam (Failed)
786 - socetframesettings_app_test_orexPolyCam (Failed)
2131 - Phocube.FunctionalTestPhocubeSunIlluminationMask (Failed)
2132 - Phocube.FunctionalTestPhocubeSurfaceObliqueDetectorResolution
(Failed)
2296 - OsirisRexMapCamModules.MapCamModuleTwoImageTest (Failed)
2305 - OsirisRexPolyCamModules.PolyCamModuleTwoImageTest (Failed)
2310 - OsirisRexSamCamModules.SamCamModuleTwoImageTest (Failed)
See here
<https://us-west-2.codebuild.aws.amazon.com/project/eyJlbmNyeXB0ZWREYXRhIjoiNDJNZ2MxbHFKTkwxV1RyQUxJekdJY3FIanNqU29rMHB4Nk1YUzk4REIrZUZDeEtEaW9HQlZ1dTZOSHpML2VUTGVDekYydmVFcU9sUHJKN20wQzd1Q0UzSzJscnB0MElDb1M3Ti9GTlJYR1RuMWJTV3V1SkJTa3NoYmc9PSIsIml2UGFyYW1ldGVyU3BlYyI6IjF3U2NTSGlDcEtCc29YVnEiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D/build/59775ba9-ed6a-4be3-9599-8b81d7936355>
for more details
—
Reply to this email directly, view it on GitHub
<#5718 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABUGSUTS3RAM36LGPEFU32T2RTUN7AVCNFSM6AAAAABWEDZ2BCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDMOBTGQZDSMRZGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
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. |
|
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. |
|
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. |
|
Think all failing tests are ok now... OsirisREx TwoImageTests Lowered test precision (they were too tight)
Phocube Tests Updated these tests and test data (isis/tests/data/phocube/20190425T211232S312_map_iofL2pan-crop.cub)
Socetframesettings app tests for OSIRIS-REx MapCam & PolyCam
I've emailed the pertinent updated socetframesettings input and truth data to @acpaquette and @Kelvinrr |
|
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. |
|
One more failing test. Updated FunctionalTestCam2CamOffbody and it's associated test data. |
|
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. |
| @@ -0,0 +1,290 @@ | |||
| \begintext | |||
There was a problem hiding this comment.
@kledmundson Apologies for getting to this late, can these addendum files be removed? They are already in the ISIS data area so I am not sure why they are being included here
|
yeah, removing now
…On Thu, Apr 3, 2025 at 12:00 PM Adam Paquette ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In
isis/src/osirisrex/objs/OsirisRexOcamsCamera/assets/orex_ocams_addendum_v05.ti
<#5718 (comment)>:
> @@ -0,0 +1,290 @@
+\begintext
@kledmundson <https://github.com/kledmundson> Apologies for getting to
this late, can these addendum files be removed? They are already in the
ISIS data area so I am not sure why they are being included here
—
Reply to this email directly, view it on GitHub
<#5718 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABUGSURIA3R3Y776QNF2VUD2XWAN3AVCNFSM6AAAAABWEDZ2BCVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDONBQHA3TGNJWG4>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
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. |
…xOcamsCamera/assets/ folder. Addresses DOI-USGS#5426.
|
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. |
3 participants
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...
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
Checklist:
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: