Updates Bundle Observation Vector to support Csm observations. #4457
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
added 21 commits
April 28, 2021 09:10
…bservation and add Csm camera type to Camera enum
…Partials member function to CSMCamera
… class and added ImageCoeffs population to Csm Observation class
…ighting that it is possible to to the observation classes
…w jigsaw to proceed past the setup stage for csm networks
jessemapel
reviewed
May 12, 2021
| } | ||
|
|
||
| BundleObservation *isisObservation = NULL; | ||
| CsmBundleObservation *csmObservation = NULL; |
There was a problem hiding this comment.
There's no need to do this. You can just use an Abstract observation.
| bundleObservation.reset(isisObservation); | ||
| } | ||
| else { | ||
| // csmObservation->setSolveSettings(solveSettings); doesn't exist |
There was a problem hiding this comment.
This does exist, see CsmBundleObservation::setSolveSettings
There was a problem hiding this comment.
Thanks @jessemapel forgot to update that. It didn't exist, I think, before the merge.
jessemapel
reviewed
May 12, 2021
There was a problem hiding this comment.
Because the ISIS and CSM observation API are so much closer together now, I am not a big fan of the two vectors solution. Can we instead initialize the exterior orientation and body rotation in the addNew function? They get called immediately after it anyway.
There's even a TODO in the current code for this:
jessemapel
reviewed
May 13, 2021
|
|
||
| bool isIsisObservation = true; | ||
|
|
||
| // This NULL check is needed solely for the unit test |
There was a problem hiding this comment.
How much work would it be to update the unit test and remove these if camera!=NULL checks?
There was a problem hiding this comment.
I'm not entirely sure. I can give it a try and timebox it?
There was a problem hiding this comment.
This looks like it's working so how about we merge this and you can put up a separate PR that tries to remove these?
jessemapel
approved these changes
May 13, 2021
tgiroux
pushed a commit
to tgiroux/ISIS3
that referenced
this pull request
Jun 8, 2021
…SGS#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov>
tgiroux
pushed a commit
to tgiroux/ISIS3
that referenced
this pull request
Jun 8, 2021
…SGS#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov>
tgiroux
pushed a commit
to tgiroux/ISIS3
that referenced
this pull request
Jun 8, 2021
…SGS#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov>
tgiroux
pushed a commit
to tgiroux/ISIS3
that referenced
this pull request
Jun 9, 2021
…SGS#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov>
jessemapel
pushed a commit
that referenced
this pull request
Jun 17, 2021
* Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov>
jessemapel
added a commit
that referenced
this pull request
Jun 29, 2021
* copylab * Initial work toward a working AbstractBundleObservation class * Fix accidentl add of temporary changes from another project * Trial 2 on fixing my accidental changes * csm bundle building properly (#4409) * Updates for linking and compiling * Starting virtual functions * Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get jigsaw tests passing on csmbundle branch (#4413) * Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get existing jigsaw tests passing * Remove unneeded functions from BundleObservation * Clean up a bit more * Clean up BundleObservation and AbstractBundleObservation more * Remove unneeded BodyRotation * Add target body solve back into bundle adjusment calc * Remove debug output * Removed unneeded memeber variables BundleObservation Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Move some functions to pure virtual * Csmobservation (#4419) * Now compiling * Updated CSMCamera tests and docs * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Added required headers from removed ground map header (#4427) * last missing header (#4428) * Moved CSM settings into BOSS * Generates Serial Numbers using CSM label information (#4437) * Creates Serial Numbers using CSM label information * Updated second SerialNumberList:add function to accommodate CSM label * Add hooks for csm bundle settings to jigsaw (#4438) * In progress * Added tests and Pvl support * Add missing 'y' to docs Co-authored-by: Kristin Berry <kberry@usgs.gov> * Moves partial calculation into CSM and ISIS observation classes. (#4436) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Implemented bundleOutputString for CSM (#4444) * Added test for CSM bundleOutputString * Passing unit test and updates to bundleOutputString * Addressed PR feedback * Csmcsv (#4446) * CSM CSV output * Small test clean-up * typo fix * obs header fix * Remove param list from bo * Added debug output * Now reurning * Fixed unit test * xml save test update * Clean up bundleresults unit test output * Fixed qfile member * Fixed old path * Changed header to use param names * Making separate csvs * Added reverse on obs by instId * Trying to fix multiple sensors * Fixed images header * More debug * removed debug outs * Added terrible imageindex search * Added held config fix * Updated for observation test * Updated jigsaw test makefiles * Updated with new tests * Updates Bundle Observation Vector to support Csm observations. (#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Jigsaw Test Conversions (sccconfig, scconfigHeld, radar) (#4463) * Converted jigsaw scconfig tests. * Added jigsaw radar test * Updated tests to reflect PR #4446 changes & removed makefile tests * Updates to scconfig tests * Gets csm bundle converging (#4464) * Added cam type checks * checking csm partials * Debug partials * debug corrections * Fixed index * Scaled ground partials * Updated param comparison * Removed debug out * Fixes spacing issue in CSM bundleout.txt (#4465) * Update csm bundlout to have correct spacing for paramter names * Reverted unintential change Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Removed unit-test specific changes I made to the code instead of the unit test * Add latitudinal partials for CSM (#4468) * Add latitudinal partials for CSM * Added test Co-authored-by: Jesse Mapel <jmapel@usgs.gov> * Csm clean up (#4483) * Added cms index list error * Added CSMCameraTests for partials * Observation clean-up * Cleaned up vector * Rename BundleObservation classes (#4518) * rename BundleObservation classes * omit changes to sip wrappers * Adds more capabilities to TestCsmModel (#4527) * Updated to get new isd/state form to test jigsaw parsing * Add functional image-to-ground, ground-to-image, and isd-parsing to TestCsmModel * Remove temporary csminit test changes * Updated variable name for clarity * add csm info to app docs for csminit and jigsaw * Csmbundle - remove SIP wrappers and deprecated formatBundleOutputString (#4526) * remove sip wrappers * remove deprecated formatBundleOutputString * remove more sip code and formatBundleOutputString * Fix functional tests to work with updated TestCsmModel (#4534) * Tests + test data for CSM jigsaw (#4530) * Removed debug couts * Added csmnetwork test fixture * Added a test for CSM test network * Adjusted trig functions + added deg/rad conversions * Initial CSMNetwork data * Uncommented code * Removed network path and control network from CSMNetwork fixture * Removed temporary path from csv comparison * Adjusted spacing + responded to PR feedback Co-authored-by: Austin Sanders <arsanders@ugs.gov> * Added the ability to update CSM model state in jigsaw (#4529) * Added the ability to update CSM model state in jigsaw * Added missing function docs * Updated CSM jigsaw test to check apply * Wrangled up an F * Added changelog entry * General clean-up * Changed Camera local photometric calculations to not use bodyrotation * Changed csm camera to save look on non-intersection * Fixed docs typos Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> Co-authored-by: Kristin Berry <kberry@usgs.gov> Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Co-authored-by: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Co-authored-by: Tim Giroux <tgiroux@contractor.usgs.gov> Co-authored-by: AustinSanders <arsanders@usgs.gov> Co-authored-by: Austin Sanders <arsanders@ugs.gov>
# for free
to join this conversation on GitHub.
Already have an account?
# 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
This is ready for review / eventual merge.
Related Issue
#4410
Motivation and Context
See #4410
How Has This Been Tested?
ctest -R Jigsaw && ctest -R jigsaw && ctest -R Bundle
Tests pass!
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: