Skip to content

Commit

Permalink
Merge branch 'dev' into trutgo
Browse files Browse the repository at this point in the history
  • Loading branch information
antonhibl authored Aug 17, 2023
2 parents 278fe69 + 4c33e0a commit 9e2f2d5
Show file tree
Hide file tree
Showing 38 changed files with 4,051 additions and 902 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ release.

## [Unreleased]


### Changed
- Removed the `.py` extention from the _isisdataeval_ tool `isisdata_mockup` for consistency and install it in $ISISROOT/bin; added the `--tojson` and `--hasher` option to _isisdata_mockup_ tool improve utility; updated the tool `README.md` documentation to reflect this change, removed help output and trimmed example results; fixed paths to test data in `make_isisdata_mockup.sh`. [#5163](https://github.com/DOI-USGS/ISIS3/pull/5163)
- Modified tgocassisstitch to optionally allow either a outputprefix or an
Expand All @@ -47,7 +48,16 @@ release.
- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)
- Added an optional cubename parameter to tgocassisstitch which lets the user
override the timestamp style naming convention of the output cube with their
own name; if not specified retains existing behavior [#5125](https://github.com/USGS-Astrogeology/ISIS3/issues/5162)
own name; if not specified retains existing behavior [#5162](https://github.com/USGS-Astrogeology/ISIS3/issues/5162)
- Significantly refactored FASTGEOM processing in <i>findfeatures</i> to accommodate stability and functionality. The scope of the algorithm was taken out of the ImageSource class and isolated to support this feature. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Report better information regarding the behavior of <i>findfeatures</i>, FASTGEOM algorithms, and creation of the output network. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)
- Add new program option <b>TONOGEOM</b> to <i>findfeatures</i> that logs captures geometry errors in the FASTGEOM algorithm and records them to the file provided in this parameter. These images are excluded from the matching process. References [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added a new Radial FASTGEOM transform mapping algorithm to <i>findfeatures</i> to address performance problems with the Grid algorithm. This is now the default algorithm if none are selected by the user (see the new <b>GLOBALS</b> parameter to specify the algorithm) [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added new parameter <b>GLOBALS</b> to make parameterization of <i>findfeatures</i> behavior significantly easier and convenient. Wrote significant documentation for the parameter and provide several examples showing its use. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added two new examples demonstrating/documenting the use of FASTGEOM algorithm, parameterization using <b>GLOBALS</b> and creation of a regional mosaic using <i>findfeatures</i>. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added new option <b>GEOMSOURCE=BOTH</b> to <i>findfeatures</i> to check both the MATCH and FROM/FROMLIST images for valid control measure geometry to produce better networks and prevent downstream processing errors. Ignore points that end up with no valid measures (but can be retained with use of <b>PreserveIgnoredControl</b> via GLOBALS parameterization). [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Added new gtests for <i>findfeatures</i> that replaces all the old application tests. These tests are <i>FunctionalTestFindfeaturesFastGeomDefault</i>, <i>FunctionalTestFindfeaturesFastGeomRadialConfig</i>, <i>FunctionalTestFindfeaturesFastGeomGridDefault</i> and <i>FunctionalTestFindfeaturesFastGeomGridConfig</i>. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)

### Deprecated

Expand All @@ -56,6 +66,11 @@ release.
### Fixed
- Updated History constructor to check for invalid BLOB before copying History BLOB to output cube [#4966](https://github.com/DOI-USGS/ISIS3/issues/4966)
- Updated photomet MinnaertEmpirical model to support photemplate-style PVL format [#3621](https://github.com/DOI-USGS/ISIS3/issues/3621)
- Fixed gaussstretch segmentation fault error and refactored gaussstretch files/tests to use gtest [#5240](https://github.com/DOI-USGS/ISIS3/issues/5240)
- Fix matrix inversion errors in <i>findfeatures</i> due to bad FASTGEOM matrix transforms using a more robust implementation to detect these errors and throw exceptions. Images with these errors are captured and logged to the <b>TONOTMATCHED</b> file. Fixes [#4639](https://github.com/DOI-USGS/ISIS3/issues/4639)
- Fixed <i>findfeatures</i> use of projected mosaics with correct check for <b>TargetName</b> in the Mapping labels. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)
- Fixed a bug in the <i>cnetwinnow</i> test that did not clean/remove it during test runs.
- Fixed <i>findfeatures</i> instantiation and use of projection classes to correctly return geometry data from projected images and mosaics. [#4772](https://github.com/DOI-USGS/ISIS3/issues/4772)

## [8.0.0] - 2023-04-19

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- eigen < 3.4
- embree>=2.17,<3
- ffmpeg
- geos>=3.9,<3.10
- geos =3.11.1
- geotiff
- gmp
- graphviz
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Group = FastGeomCommonParameters
# Defaults used for findfeatures FastGeom Algorithms

# FastGeomAlgorithm = radial
FastGeomPoints = 25
FastGeomTolerance = 3
# GeomType = camera

FastGeomQuerySampleTolerance = 0
FastGeomQueryLineTolerance = 0
FastGeomTrainSampleTolerance = 0
FastGeomTrainLineTolerance = 0

FastGeomDumpMapping = false
EndGroup = FastGeomCommonParameters


Group = FastGeomGridParameters
# FastGeomAlgorithm = grid

FastGeomGridStartIteration = 0
# FastGeomGridStopIteration = 1 to N
FastGeomGridIterationStep = 1

FastGeomTotalGridIterations = 1

FastGeomGridSaveAllPoints = false
EndGroup = FastGeomGridParameters


Group = FastGeomRadialParameters
# FastGeomAlgorithm = radial

FastGeomRadialSegmentLength = 25
FastGeomRadialPointCount = 5
FastGeomRadialPointFactor = 1.0

# FastGeomRadialSegments = N
EndGroup = FastGeomRadialParameters
End
2 changes: 1 addition & 1 deletion isis/cmake/Utilities.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function(get_os_version text)
# Format the string
string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" version "${result}")
string(REGEX MATCH "^[0-9]+.[0-9]+" version "${version}")
string(REPLACE "." "_" version ${version})
string(REPLACE "." "_" version "${version}")

set(name "MacOSX")
set(prefix "Darwin_x86_64_")
Expand Down
Loading

0 comments on commit 9e2f2d5

Please sign in to comment.