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

Update my fork with USGS latest #3

Merged
merged 73 commits into from
May 13, 2021
Merged

Update my fork with USGS latest #3

merged 73 commits into from
May 13, 2021

Conversation

KrisBecker
Copy link
Owner

Update from USGS/ISIS3 after 5.0 release.

amystamile-usgs and others added 30 commits February 18, 2021 21:18
* Remove references to ISIS3 and replace with references to ISIS

* Remove references to ISIS3 and replace with ISIS

* Updated "isis" and "Isis" to "ISIS"

* Update TestPreferences

* Update IsisPreferences

* Reverted changes from 'Isis to ISIS' commit to see if it fixes failing tests.

Co-authored-by: Stuart Sides <[email protected]>
* Updated disclaimer in base objects.

* Fixed error
* Updated disclaimers to .cpp and .h files

* Updated disclaimers

* Updated disclaimers to mission .cpp and .h files

* Updated disclaimers.

* Fixed accidental deletion.

Co-authored-by: Stuart Sides <[email protected]>
* 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]>
* lorri2isis Test Conversion

* lorri2isis Test Conversion
* Removed GMM

* Removed from environment
* moccal now uses Camera for calib

* removed prints
* ctxcal now uses cam

* added checkerror calls

* removed some check status

* import NaifStatus
* Update gllssical to work without local spice kernels

* getClockTime doesn't furnsh missing kernels

* Move into try

* Updated to work on old spiceinited data and add test

* A bit of cleanup

* Forgot first naif status

* Update to use setImage to set the time of the camera

* Updated based on feedback

Co-authored-by: Kristin Berry <[email protected]>
* Adds a publishable dockerfile

* Updates README with docker data instructions
* added intial tests

* idk

* finished tests

* removed old tests

* added rad group checks

* removed files
* added ctxcal tests

* removed old tests

* removed prefix mentions

* missed a spot

* whitesoace'

* added rad group checks
* Segment App and Test Conversion

* Removal of Makefile Tests
* Update to use camera for time

* Update documentation and match non-camera output

* Update hijitreg.xml
…ion (#4336)

* Added capabilities for camera to get sun distance

* Update Kaitlyn's amicacal PR based on feedback

* Update AmicaCalUtils.h

Co-authored-by: Kaitlyn Lee <[email protected]>
Co-authored-by: Kristin Berry <[email protected]>
…4335)

* Update shadow documentationt to mention when SPICE kenrels are needed

* Update based on feedback

Co-authored-by: Kristin Berry <[email protected]>
* added tests

* addressed comments
…pice and changelog entry (#4343)

Co-authored-by: Kristin Berry <[email protected]>
* vikcal tests added

* removed old tests

* addressing comments

* removed coeff comparisons
* Add documentation for calibration app updates to work without local spice and changelog entry

* Update changelog entry for calibration work

Co-authored-by: Kristin Berry <[email protected]>
* Updated to new blob structure

* Clean up after being able to look at all of the changes at once

* Changed the history read to return a history object rather than a pointer

* Addressed PR feedback

* Imagepolygon Update (#4308)

* Converted Imagepolygon to no longer be a subclass of blob

* Updated Imagepolygon with constructor chaining

* Fixed error message

* Refactor OriginalLabel class to remove inheritance from Blob (#4309)

* Initial refactor of OriginalLabel class

* Addressed PR feedback

* Fixed error message

Co-authored-by: Jesse Mapel <[email protected]>

* Modified Table to not inherit from Blob anymore (#4312)

* Ported Table test to gtest

* Table refactor

* Fixed merge issue

* Fixed merge issues

* Removes blob inheritance from OriginalXmlLabel (#4316)

* Initial refactor of OriginalLabel class

* Addressed PR feedback

* Fixed error message

* Remove blob inheritance from originalxmllabel

* Removed commented / old code

* Added byte order specification

* History object tests (#4314)

* Adds History object tests

* Updated blob tests to use a non-pointer variable

* Removed gisblob from isis (#4329)

* Removed blob inheritance from stretchblob (#4331)

* Removed blob inheritance from stretchblob

* Addressed feedback + working read/write

* Updated cubestretch with the stretch blob functionality

* Removed stretchBlob and updated cubestretch/cube with read write functionality

* Replaced readStretchBlob with readCubeStretch

* Fixed segfault

* Removed debug print statements

* Added check for existence of OriginalLabel before attempting to propagate

* Addressed PR feedback

Co-authored-by: Adam Paquette <[email protected]>

* Removed StringBlob Class (#4321)

* Converted StringBlob

* Removed StretchBlob class

* Changed Blob setData to copy

* Added csminit change and docs

* Removed old memcopy

* History Blob Old Implementation (#4342)

* Implemented old history functionality

* Removed old history unit test

* Fixed original label reading

* Fixed Blob branch test failures (#4344)

* Fixed test failures

* More clean-up

* Fixed marci2isis test

* Blob final clean-up (#4346)

* Redid Blob writing

* Added docs

* Review feedback

* Fixed int comparison

Co-authored-by: Adam Paquette <[email protected]>
Co-authored-by: AustinSanders <[email protected]>
…4) (#4340)

* Update Camera.cpp to fix not correctly calculating the local norm

This fixes Camera.cpp not correctly calculating the local norm for pushbroom cameras.
This is in reference to Issue #4018, whereas DBL_MIN is not operating as expected, causing an error later in the code, when integer rounding occurs. This erroneously returns the next/previous framelet. Currently, the DBL_MIN is not operating as expected. The functionality that is intended is:
Calculate normal by grabbing elevation values at the edges of the pixel in question.

Originally the fix was submitted via PR#4214 for branch 3.10.2 but since that branch is no longer active, changes will be submitted to dev.

* Updated Camera.h with comments addressing fix for issue#4018
acpaquette and others added 29 commits March 20, 2021 09:33
* Update SetInputListFile to use the FileList object rather than the TextFile object.
Also updated SetInputListFile isisparameter function to chain into the 
SetInputListFile FileName function.

* Modified filelist to handle list files with no trailing new line character

* Added a test to check that filelist retains expected new functionality

* Fixed issues with pipeline and hardcoded values in hijitter

* Removed specific mention of trailing new line necessity in cubeit.xml

* Updated changelog

Co-authored-by: Jesse Mapel <[email protected]>
* Normalized test names and file names

* Addressed PR feedback
* Removed label from nn

* Restricted opencv to 3.2

* Converted phocube

* Added some phocube changes

* Added special pixel test

* Updated disclaimer in base objects.

* Added off_body test

* Added rf and no bandbin tests

* Added history entry and histogram checks

* Removed Makefile tests

* Deleted commented code

* Update phocube.h
* Added check to make small images use slowgeom instead

* comment

* Changelog add
…e arrays (#4381)

* Added ability to identify arrays in the csv and place those into arrays in the table

* Added to change log

* Added to the documentation

* Update csv2table.xml

* Update main.cpp
* Added check to make small images use slowgeom instead

* comment

* Changelog add

* fixed some tests

* paths

* updateed file to check for getsn

* typo
* Updated Unit Test for SamCam

* Addressed PR feedback
* add warning for inaccurate MeanRadiusValue

* Give a stronger warning
* add pin_compatible for jasper and xerces

* added jasper to host deps

* Added missing packages

* Added geotiff to run deps

* Added missing packages

* Added pin_compatibility style versioning

* Pinned geotiff

* Prep for 5.0.0RC1

* Fixed version tick

* Fixed ordering of packages
* added code for two tests

* test modifications

* changed crop input and ouput function

* fixed last two tests

* added more tests

* removed old tests

* added tests and removed old test files

* added tests for exceptions
* Fixed logging for findfeatures

* Corrected log write check in findfeatures application

* Updated the change log
* Added Zenodo link to Credit and Reference pages

* corrections to zenodo file

* Addressed PR feedback.
* Updated website Tutorial links

* Add document history.
* Apolloremrx conversions

* Modified tests to use ApolloCube instead of LargeCube.

* Addressed PR feedback
* Fixed issue where the acos of -1.0000000001 was resulting in a nan

* Update variable name

* Add entry to changelog
* Updated links to Map Projections Tutorial

* Updated remaining "fixit" links to Github.
* Sumspice test/app conversion

* Sumspice test conversions

* Addressed PR feedback

* Added tests for updating position and pointing.
* conditionally reopen cube to prevent segfault

* relocate cube close
* Updated bad stats to NA.

* Added gtests and removed old makefile tests.

* Updated changelog.

* Addressed PR feedback
* removed makefiles and made gtests, just needs a bit of polish

* added test case for edge gap

* fixed testfile name

* removed accidental path

* fix osx test failures

Co-authored-by: Giroux <[email protected]>
* Updated changelog to reflect the current 5.0 branch

* Made the buildCondaRelease executable

* Updated ISIS version based on PR feedback
* Forced stats bestmin and bestmax to return the min and max if they are equal

* Added change log entry
* first few test cases, needs work

* two working tests

* add test for correlation tolerance

* improve test data creation code
* app conversion

* add test data and working test case

* move data

* compare framelets
@KrisBecker KrisBecker merged commit fb6a418 into KrisBecker:dev May 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.