Merge branch 'dev' into clean_csmcamera_sky

DOI-USGS · Jan 18, 2024 · 88aa47c · 88aa47c
2 parents 53acbd7 + 9d7f213
commit 88aa47c
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,7 +40,10 @@ release.
 - CSMCamera can now read and use the body rotation from ALE produced ISDs [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)
 - CSMSkyMap added to CSMCamera for use with local rover projections in ISIS [#5072](https://github.com/DOI-USGS/ISIS3/pull/5072)
 
-## [8.1.0] - 2023-12-05
+### Fixed
+- Fixed <i>noproj</i> bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. This resulted in the Bullet collision detection engine not being used. Issue: [#5377](https://github.com/USGS-Astrogeology/ISIS3/issues/5377)
+
+## [8.1.0] - 2024-01-08
 
 ### Changed
 - Cnetthinner has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354), 
@@ -53,6 +56,8 @@ release.
   outputsuffix, both, or neither for naming convention purposes. [#5162](https://github.com/DOI-USGS/ISIS3/pull/5162)
 - Changed the default PCK load behavior to try and load mission specific PCKs, if that fails we default to the base PCKs [#5335](https://github.com/DOI-USGS/ISIS3/pull/5335)
 - Disabled option to use web=true when running spiceinit with HRSC images. [#5223](https://github.com/DOI-USGS/ISIS3/issues/5223)
+- Set build option `pybindings=ON` in `build.sh` to turn on python bindings. [#5389](https://github.com/DOI-USGS/ISIS3/pull/5389)
+- Updated Ale to version 0.10.0 [#5399](https://github.com/DOI-USGS/ISIS3/pull/5399)
 
 ### Added
 - Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)
@@ -69,13 +74,14 @@ release.
 - Added ability to delegate calculation of nadir pointing to ALE [#5117](https://github.com/USGS-Astrogeology/ISIS3/issues/5117)
 - Added --no-kernels flag to downloadIsisData [#5264](https://github.com/DOI-USGS/ISIS3/issues/5264)
 - Added notice for depreciation to PvlObject::addLogGroup function which will be depreciated in favor of Application::appendAndLog(https://github.com/DOI-USGS/ISIS3/issues/5310)
+- Added new csm plugins path to IsisPreferences [#5397](https://github.com/DOI-USGS/ISIS3/pull/5397)
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
-- Bug fix for Cnetthinner app resolving divide by zero in CnetManager.cpp. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354), 
+- Bug fix for Cnetthinner app resolving divide by zero in CnetManager.cpp. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354) 
 - Updated photomet MinnaertEmpirical model to support photemplate-style PVL format [#3621](https://github.com/DOI-USGS/ISIS3/issues/3621)
 - 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)

diff --git a/code.json b/code.json
@@ -87,5 +87,49 @@
     "date": {
       "metadataLastUpdated": "2023-04-19"
     }
+  },{
+    "name": "ISIS3",
+    "organization": "U.S. Geological Survey",
+    "description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",
+    "version": "8.1.0_RC2",
+    "status": "Production",
+
+    "permissions": {
+      "usageType": "openSource",
+      "licenses": [
+        {
+          "name": "Public Domain, CC0-1.0",
+          "URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.1.0_RC2/LICENSE.md"
+        }
+      ]
+    },
+
+    "homepageURL": "https://isis.astrogeology.usgs.gov",
+    "downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.1.0_RC2/8.1.0_RC2.zip",
+    "disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.1.0_RC2/DISCLAIMER.md",
+    "repositoryURL": "https://code.usgs.gov/astrogeology/isis.git",
+    "vcs": "git",
+
+    "laborHours": 0,
+
+    "tags": [
+      "Planetary",
+      "Remote Sensing",
+      "Photogrammetry",
+      "Data Processing"
+    ],
+
+    "languages": [
+      "C++"
+    ],
+
+    "contact": {
+      "name": "Christine Kim",
+      "email": "[email protected]"
+    },
+
+    "date": {
+      "metadataLastUpdated": "2024-01-08"
+    }
   }
 ]
diff --git a/environment.yml b/environment.yml
@@ -3,7 +3,7 @@ channels:
   - defaults
 
 dependencies:
-  - ale>=0.9.1, <1
+  - ale>=0.10.0, <1
   - armadillo
   - boost>=1.72.0, <2
   - boost-cpp>=1.72.0, <2

diff --git a/environment_gcc4.yml b/environment_gcc4.yml
@@ -6,7 +6,7 @@ channels:
   - defaults
 
 dependencies:
-  - ale>=0.8.5
+  - ale>=0.10.0
   - boost=1.68.0
   - armadillo
   - blas

diff --git a/isis/IsisPreferences b/isis/IsisPreferences
@@ -178,7 +178,8 @@ EndGroup
 ########################################################
 
 Group = Plugins
-  CSMDirectory = ("$ISISROOT/lib/isis/csm3.0.3/", -
+  CSMDirectory = ("$ISISROOT/lib/csmplugins/", -
+                  "$ISISROOT/lib/isis/csm3.0.3/", -
                   "$ISISROOT/csmlibs/3.0.3/", -
                   "$HOME/.Isis/csm3.0.3/")
 EndGroup

diff --git a/isis/cmake/FindPCL.cmake b/isis/cmake/FindPCL.cmake
@@ -7,7 +7,7 @@
 
 find_path(PCL_INCLUDE_DIR
   NAME pcl_base.h
-  PATH_SUFFIXES "pcl-1.8/pcl" "pcl-1.9/pcl" "pcl-1.11/pcl" "pcl-1.12/pcl" "pcl-1.13/pcl"
+  PATH_SUFFIXES "pcl-1.8/pcl" "pcl-1.9/pcl" "pcl-1.11/pcl" "pcl-1.12/pcl" "pcl-1.13/pcl" "pcl-1.14/pcl"
 )
 
 find_library(PCL_COMMON_LIBRARY NAMES pcl_common)

diff --git a/isis/src/base/apps/noproj/noproj.cpp b/isis/src/base/apps/noproj/noproj.cpp
@@ -260,7 +260,10 @@ namespace Isis {
         bool isTable = false;
         bool isFrameCode = kernelsKeyword.isNamed("NaifFrameCode") ||
                            kernelsKeyword.isNamed("NaifIkCode");
-        bool isShapeModel = kernelsKeyword.isNamed("ShapeModel");
+        bool isShapeModel = kernelsKeyword.isNamed("ShapeModel") ||
+                            kernelsKeyword.isNamed("RayTraceEngine") ||
+                            kernelsKeyword.isNamed("BulletParts") ||
+                            kernelsKeyword.isNamed("Tolerance");
 
         for (int keyValueIndex = 0; keyValueIndex < kernelsKeyword.size(); keyValueIndex++) {
           if (kernelsKeyword[keyValueIndex] == "Table") {

diff --git a/isis/src/base/apps/noproj/noproj.xml b/isis/src/base/apps/noproj/noproj.xml
@@ -67,6 +67,15 @@
     <change name="Kaitlyn Lee" date="2021-03-31">
       Refactored app to be callable and converted its tests to GTests.
     </change>
+    <change name="Kris Becker" date="2021-05-06">
+          Added checks for ray tracing options in UofA OSIRIS-REx ISIS code base.
+          The keywords needed for Bullet to operate properly are RayTraceEngine,
+          BulletParts, and Tolerance. These parameters must be included in the
+          output label in order for cam2cam to run and subsequent use is consistent.
+    </change>
+    <change name="Ken Edmundson" date="2023-12-14">
+          Incorporated Kris Becker's 2021-05-06 bug fix above into USGS code base.
+    </change>
   </history>
 
   <category>

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -45,7 +45,7 @@ build:
 # Shotgun strat on requirements until we can narrow them down
 requirements:
   build:
-   - ale=0.9.1
+   - ale=0.10.0
    - aom
    - armadillo
    - boost=1.72