Multisensor #3792
Merged
Multisensor #3792
+1,004
−270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 tasks
acpaquette
approved these changes
Mar 23, 2020
| BundleObservationSolveSettings::stringToInstrumentPointingSolveOption( | ||
| "NoPointingFactors"); | ||
| heldSettings.setInstrumentPointingSettings(noPointing, | ||
| ui.GetBoolean("TWIST"), | ||
| ui.GetInteger("CKDEGREE"), | ||
| ui.GetInteger("CKSOLVEDEGREE"), | ||
| ui.GetBoolean("OVEREXISTING"), | ||
| positionAprioriSigma, | ||
| anglesAprioriSigma, |
There was a problem hiding this comment.
Any particular reason this was changed? Just for consistency?
There was a problem hiding this comment.
This is a bug from before. The position sigmas should be passed into the position call and the angle sigmas should be passed into the angles call. Functionally this doesn't change anything other than output files because the image is held fixed so the sigmas are not used.
| throw IException(IException::Unknown, | ||
| QString("Failed to parse xml file, [%1]").arg(xmlPath), | ||
| _FILEINFO_); | ||
| // If CKSOLVEDEGREE is not specified, then a default of 2 is used -------jwb----- why ??? why not match camsolve option ??? |
There was a problem hiding this comment.
This is still true as it's set in the initialize() call above. Could remove Jeannie's comment/make the change.
|
heldImage test data has been checked in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Added SSCONFIG parameter to jigsaw.xml. This allows users to pass in a pvl file to set different parameters for different instruments. Added logic into jigsaw's main.cpp in order to facilitate the use of this new parameter.
Added a new BundleObservationSolveSettings constructor to build a BundleObservationSolveSettings given a pvl group.
This is a continuation of #3612.
Related Issue
#3369
Motivation and Context
How Has This Been Tested?
All tests pass on Ubuntu except for those currently failing on nightly. All test data except for jigsaw's heldImage test has been checked in. This changes the output for held images, before they listed their apriori sigmas as the same as the rest of the images, but now they list them as N/A because they are not being adjusted. Once this is merged updated test data will be checked in.
Screenshots (if appropriate):
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: