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.

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

Fixes to correct handling of radius in jigsaw gui and bundleout.txt for a rectangular (XYZ) bundle adjustment. #5643

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

kledmundson
Copy link
Contributor

@kledmundson kledmundson commented Oct 22, 2024

Description

In the jigsaw gui, if the CONTROL_POINT_COORDINATE_TYPE_BUNDLE under "Control Point Parameters" is RECTANGULAR, then the RADIUS checkbox under "Solve Options" should be excluded. Also, with error propagation turned on in a rectangular (XYZ) solution, uncertainty statistics for Point Z coordinates are not reported in the "POINTS UNCERTAINTY SUMMARY" section. Instead, the RMS, MIN, and MAX of RADIUS coordinates is reported as "N/A."

Fixes are as follows...

  1. The RADIUS checkbox in the jigsaw GUI is now excluded when a RECTANGULAR solution is selected.

  2. For rectangular solutions, in the bundleout.txt file...

  • RADIUS is now set to N/A in the SOLVE OPTIONS section
  • the POINTS UNCERTAINTY SECTION was fixed to properly display adjusted point uncertainty statistics with Error Propagation turned on.
  1. Spacing for point labels was cleaned up in the INPUT: GLOBAL IMAGE PARAMETER UNCERTAINTIES section.

  2. Finally, a slight modification was added to the FunctionalTestJigsawBundleXYZ ctest to verify that RADIUS is N/A in a RECTANGULAR solution.

Related Issue

#5642

How Has This Been Validated?

All jigsaw and bundle related tests continue to pass (except by the way for the ApolloNetwork.FunctionalTestJigsawSaveApplyValues test, which is also failing in dev on OSX). As above, the FunctionalTestJigsawBundleXYZ ctest was modified to verify that RADIUS is N/A in a RECTANGULAR solution.

Also, reconfirmed output RMS, MIN, MAX of adjusted point coordinates in both Latitudinal and Rectangular solutions by comparing with the points.csv file.

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.

…nd in the bundleout.txt file when performing a rectangular (XYZ) bundle adjustment, originally implemented in UofA OSIRIS-REx code on 2019-07-30. Addresses DOI-USGS#5642.

* The RADIUS checkbox in the GUI is excluded when a RECTANGULAR solution is selected.

* In the bundleout.txt file, for rectangular solutions, 1) RADIUS is set to N/A in the SOLVE OPTIONS section; and 2) the POINTS UNCERTAINTY SECTION was fixed to properly display adjusted point uncertainty statistics with Error Propagation turned on.

* Spacing for point labels was cleaned up in the INPUT: GLOBAL IMAGE PARAMETER UNCERTAINTIES section.

* Finally, a slight modification was added to the FunctionalTestJigsawBundleXYZ ctest to verify that RADIUS is N/A in a RECTANGULAR solution.
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_5643".

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.

@AustinSanders AustinSanders self-requested a review October 22, 2024 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants