Modified CSM setImage to intersect the shape model #4266
Merged
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
jessemapel
changed the title
jessemapel
commented
Jan 31, 2021
| // ISIS sensors work in Kilometers, CSM works in meters | ||
| std::vector<double> obsPosition = {imageLocus.point.x / 1000.0, | ||
| imageLocus.point.y / 1000.0, | ||
| imageLocus.point.z / 1000.0}; |
There was a problem hiding this comment.
I would like to put this through the csm->ISIS conversion but I'm concerned about it being slow and it still requires making a surface point and specifying that it's in meters. So, it's still prone to errors for unit conversions.
krlberry
approved these changes
Feb 1, 2021
scsides
approved these changes
Feb 1, 2021
jessemapel
added a commit
that referenced
this pull request
Feb 19, 2021
* Initial CSMCamera model implementation. * Get CSM Camera working through a dummy setimage * More progress on SetImage * Cleanup. * Added resolution and radii to CSM camera model (#4261) * Added psuedoinverse method * Added CSM pixel resolution calculations * Add subsurfacepoint code and get working up to but not through setimage (#4264) Co-authored-by: Kristin Berry <[email protected]> * Changed pseudoinverse computation to armadillo SVD based (#4263) * Changed psuedoinverse to Armadillo SVD * Fixed name * Fixed comparison warning * In progress set ground * Add SetUniversalGround for CSMCamera and nullptr initializations in Spice defaultinit Co-authored-by: Kristin Berry <[email protected]> * Modified CSM setImage to intersect the shape model (#4266) * Fixed scaling issue in setImage * Added shape model intersection * added initial CSMCamera test (#4267) * added initial CSMCamera test * Added matchers and more tests * Added more set ground tests * minor clean up * Added proper ShapeModel stuff (#4269) * Added proper ShapeModel stuff * General clean-up * Starting to get campt working (#4270) * Added a bunch more stuff for campt (#4272) * Added a bunch of stuff for campt * Fixed compiler error * Got RA, DEC, and all Solar Calculations from campt correctly returning NULL (#4273) Co-authored-by: Kristin Berry <[email protected]> * Updated CSMCamera tests to pass (#4278) * Updated CSMCamera tests * made another fixture * Moved dem radius to 1 place in the fixture * Added remaining function tests * Finished CSMCamera tests * Flipped illumination vector * Updated CameraFactory unitTest for new error message * Removed campt couts * Updated chip truth data for new camera factory error * Re-fixed CameraFactory truth * Changed Spice hasGroup to hasBlob for Target unit test * Update camera plugin loading and add a check to csminit that the camera can be instantiated. (#4279) * Update camera plugin loading and add a check to csminit that the camera model can be instantiated. * Update csminit to restore original label contents if csminit fails * Working on debugging an issue with saving and restoring the original csmstate blob if csminit fails * Updated StringBlob to be able to read in and then write out the same blob without doubling it * Update to use existing TargetName in label if not supplied by user. Co-authored-by: Kristin Berry <[email protected]> * Added campt and hasblob tests (#4283) * Added campt and hasblob tests * Fixed spacing * Updated CSMCamera doc strings (#4282) * Updated doc strings * Added cmapt history * Fixed typo in CSMCamera::sunPosition docs * Get csminit tests passing (#4284) * Update tests * Get csminit tests passing Co-authored-by: Kristin Berry <[email protected]> * Updated UTC time conversions (#4288) * Converted iTime test * Modified iTime::setUtc to accept basic formats * Update CSMCamera to use iTime::setUtc * Removed old include * docs clean-up * Update csminit to work with an input state and add associated tests. * Combined ISD vs State into single if else * Added changelog and histories * Removed duplicate error check * Fixed review comments * Added Sensor history comment Co-authored-by: Kristin <[email protected]> Co-authored-by: Kristin Berry <[email protected]>
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.
Changed setImage to intersect the shape model. I also added some helpers to ensure that we properly handle CSM working in meters vs ISIS working in kilometers. This was causing the resolution calculations to fail because setImage wasn't scaling correctly.