COMP: Update Ebsdlib to 1.0.31 (#1056)

* COMP: Update Ebsdlib to 1.0.31 - This is needed to solve a symmetry operator issue with Monoclinic Laue classes - Update the GBPD Unit test exemplar data files - Update to EbsdLib 1.0.32 - Update Pole Figure Test files - Update the IPF Legends. These were generated using DREAM.3D Version 6.5 using EbsdLib version 1.0.32 --------- Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Aug 30, 2024 · 98a7993 · 98a7993
1 parent a613be9
commit 98a7993
Show file tree

Hide file tree

Showing 27 changed files with 21 additions and 16 deletions.
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicLowOps Cubic m-3 (Th).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicLowOps Cubic m-3 (Th).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicOps Cubic m-3m (Oh).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/CubicOps Cubic m-3m (Oh).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic_High.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic_High.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic_low.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Cubic_low.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hex_high.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hex_high.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hex_low.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Hex_low.png
diff --git a/...gins/OrientationAnalysis/data/IPF_Legend/HexagonalLowOps Hexagonal 6m (C6h).png b/...gins/OrientationAnalysis/data/IPF_Legend/HexagonalLowOps Hexagonal 6m (C6h).png
diff --git a/...ugins/OrientationAnalysis/data/IPF_Legend/HexagonalOps Hexagonal 6mmm (D6h).png b/...ugins/OrientationAnalysis/data/IPF_Legend/HexagonalOps Hexagonal 6mmm (D6h).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Monoclinic.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Monoclinic.png
diff --git a/...ugins/OrientationAnalysis/data/IPF_Legend/MonoclinicOps Monoclinic 2m (C2h).png b/...ugins/OrientationAnalysis/data/IPF_Legend/MonoclinicOps Monoclinic 2m (C2h).png
diff --git a/.../OrientationAnalysis/data/IPF_Legend/OrthoRhombicOps Orthorhombic mmm (D2h).png b/.../OrientationAnalysis/data/IPF_Legend/OrthoRhombicOps Orthorhombic mmm (D2h).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Orthorhombic.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Orthorhombic.png
diff --git a/...ns/OrientationAnalysis/data/IPF_Legend/TetragonalLowOps Tetragonal 4m (C4h).png b/...ns/OrientationAnalysis/data/IPF_Legend/TetragonalLowOps Tetragonal 4m (C4h).png
diff --git a/...ins/OrientationAnalysis/data/IPF_Legend/TetragonalOps Tetragonal 4mmm (D4h).png b/...ins/OrientationAnalysis/data/IPF_Legend/TetragonalOps Tetragonal 4mmm (D4h).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal_High.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal_High.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal_Low.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Tetragonal_Low.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Triclinic.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Triclinic.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TriclinicOps Triclinic -1 (Ci).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TriclinicOps Triclinic -1 (Ci).png
diff --git a/...lugins/OrientationAnalysis/data/IPF_Legend/TrigonalLowOps Trigonal -3 (C3i).png b/...lugins/OrientationAnalysis/data/IPF_Legend/TrigonalLowOps Trigonal -3 (C3i).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalOps Trigonal -3m (D3d).png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/TrigonalOps Trigonal -3m (D3d).png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal_Low.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/Trigonal_Low.png
diff --git a/src/Plugins/OrientationAnalysis/data/IPF_Legend/trigonal_HIgh.png b/src/Plugins/OrientationAnalysis/data/IPF_Legend/trigonal_HIgh.png
diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt
@@ -121,6 +121,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME caxis_data.tar.gz SHA512 56468d3f248661c0d739d9acd5a1554abc700bf136586f698a313804536916850b731603d42a0b93aae47faf2f7ee49d4181b1c3e833f054df6f5c70b5e041dc)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_ebsd_segment_features.tar.gz SHA512 acbb493a0668e0115ac49d4fedbbf7600759b9a66deb5d1004c2749a61d2bad2fcc60344bf72b2aeda5c8c098f458949dd1f8d58cb21682fa1393dfb7d0a1b84)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_find_gbcd_metric_based.tar.gz SHA512 46032c758acc982eccaff38c3252a4f063b6ff5dc9ba3f33ed7f123c6f10771e1a2bdcbff8aab0fae7c91c03bb6025f49f0edbb085b3946b93b87980d31e4543)
+  download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_find_gbpd_metric_based.tar.gz SHA512 79c383024c926e97d647c609a866253a446bde41a6b821991bd9211789421a02ca8ec6253bc1bcca8e955169faed278d483b0ca129422ed1c24d756fb550f678)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_ImportH5Data.tar.gz SHA512 68cf620d28a515d04040d66c4f8fa9d8d46707c65138b366b47f40d1d56a36c40e2e2cd0c9d35168b68c2cb5b2ce95650fa2a0d4e6ffce980d0dd0654908f40d)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ang_data.tar.gz SHA512 1777431a1623e2fffdc2daad9be51a72c3bdf6a83a33893827892c98a811991e21f1cf636e036604d0bbc523d8ca0b9d655c28be3d0e89ccafc1486dfa0bd0c7)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ctf_data_2.tar.gz SHA512 f397fa3bf457615a90a4b48eaafded2aa4952b41ccb28d9da6a83adc38aea9c22f2bb5a955f251edeca9ef8265b6bf1d74e829b1340f45cf52620a237aad1707)
@@ -133,7 +134,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME H5Oina_Test_Data.tar.gz SHA512 346573ac6b96983680078e8b0a401aa25bd9302dff382ca86ae4e503ded6db3947c4c5611ee603db519d8a8dc6ed35b044a7bfea9880fade5ab54479d140ea03 )
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME INL_writer.tar.gz SHA512 7d723351e51e84540abfbc38e69a6014852ba34808f9d216a27063a616bcfbd5eb708405305fd83334e48c9ca133d3d0be797c05040e4a115cc612e385d9ada6)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME neighbor_orientation_correlation.tar.gz SHA512 122367452174ade2f24dde7a4610bddc4f147a223722d9b30c1df9eaa2cd2bf25e1c7957aba83f3f9de79b4eadd79339b848f9530d1ebf44c69244ea5442cf85)
-  download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME PoleFigure_Exemplars_v2.tar.gz SHA512 1c7169e01e66cff074bd58fc188ec69d26df10c4eb61feeb2b123cab945ea44c0419b5d76ab422fc6c585e0a4078bf796f785e7e6ccccc84cc1c518631afb589)
+  download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME PoleFigure_Exemplars_v3.tar.gz SHA512 1ccdc4c72742b46d5d936c1a9aeb5c817d5628b0a790813256bc6b689d9a5a3ffa8918b538d7374183e79738f75c8d9f65e47ae8e24afd5d0a2764fda0b16061)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME Small_IN100_Ang_Files.tar.gz SHA512 79e9f6948d4e8e06187e11216a67596fa786ffd2700e51f594ad014090383eb8bcc003e14de2e88082aa9ae512cc4fc9cee22c80066fc54f38c3ebc75267eb5b)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME Small_IN100_dream3d_v2.tar.gz SHA512 d2c6d537e3085f944ef3ce6b79553b65ead81f7f25fc4810af642e1d3dc86c465727e2bfb886b77e6da41e987e502c4263a35164aa8c07453853659d10f3de24)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME Small_IN100_h5ebsd.tar.gz SHA512 31e606285ea9e8235dcb5f608fd2b252a5ab1492abd975e5ec33a21d083aa9720fe16fb8f752742c140f40e963d692f1a46256b9d36e96b1b09796c1e4ea3db9)

diff --git a/src/Plugins/OrientationAnalysis/test/ComputeGBPDMetricBasedTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeGBPDMetricBasedTest.cpp
@@ -14,6 +14,7 @@ namespace fs = std::filesystem;
 
 using namespace nx::core;
 using namespace nx::core::Constants;
+using namespace nx::core::UnitTest;
 
 namespace
 {
@@ -41,20 +42,18 @@ const DataPath k_ComputedErrorPath({"NX_errors"});
 
 TEST_CASE("OrientationAnalysis::ComputeGBPDMetricBasedFilter: Valid Filter Execution", "[OrientationAnalysis][ComputeGBPDMetricBasedFilter]")
 {
-  Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
-
-  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_gbcd_metric_based.tar.gz",
-                                                              "6_6_find_gbcd_metric_based");
+  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_find_gbpd_metric_based.tar.gz",
+                                                              "6_6_find_gbpd_metric_based");
 
   Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
   auto* filterList = Application::Instance()->getFilterList();
 
   // Read Exemplar DREAM3D File Input
-  auto exemplarInputFilePath = fs::path(fmt::format("{}/6_6_find_gbcd_metric_based/6_6_find_gbcd_metric_based.dream3d", unit_test::k_TestFilesDir));
+  auto exemplarInputFilePath = fs::path(fmt::format("{}/6_6_find_gbpd_metric_based/6_6_find_gbpd_metric_based.dream3d", unit_test::k_TestFilesDir));
   DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarInputFilePath);
 
-  fs::path exemplarDistOutput(fmt::format("{}/6_6_find_gbcd_metric_based/6_6_gbpd_distribution_1.dat", unit_test::k_TestFilesDir));
-  fs::path exemplarErrorsOutput(fmt::format("{}/6_6_find_gbcd_metric_based/6_6_gbpd_distribution_errors_1.dat", unit_test::k_TestFilesDir));
+  fs::path exemplarDistOutput(fmt::format("{}/6_6_find_gbpd_metric_based/6_6_gbpd_distribution_1.dat", unit_test::k_TestFilesDir));
+  fs::path exemplarErrorsOutput(fmt::format("{}/6_6_find_gbpd_metric_based/6_6_gbpd_distribution_errors_1.dat", unit_test::k_TestFilesDir));
   fs::path computedDistOutput(fmt::format("{}/computed_gbpd_distribution_1.dat", unit_test::k_BinaryTestOutputDir));
   fs::path computedErrorsOutput(fmt::format("{}/computed_gbpd_distribution_errors_1.dat", unit_test::k_BinaryTestOutputDir));
 
@@ -153,6 +152,11 @@ TEST_CASE("OrientationAnalysis::ComputeGBPDMetricBasedFilter: Valid Filter Execu
     }
   }
 
+// Write the DataStructure out to the file system
+#ifdef SIMPLNX_WRITE_TEST_OUTPUT
+  WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/Compute_GBPD_Metric_Based.dream3d", unit_test::k_BinaryTestOutputDir)));
+#endif
+
   // compare results
   UnitTest::CompareArrays<float32>(dataStructure, k_ExemplarDistributionPath, k_ComputedDistributionPath);
   UnitTest::CompareArrays<float32>(dataStructure, k_ExemplarErrorPath, k_ComputedErrorPath);

diff --git a/src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp b/src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp
@@ -62,10 +62,10 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-1", "[OrientationAnalysis]
 {
   Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
 
-  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars_v2.tar.gz", "PoleFigure_Exemplars_v2");
+  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars_v3.tar.gz", "PoleFigure_Exemplars_v3");
 
   // Read the Small IN100 Data set
-  auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars_v2/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir));
+  auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars_v3/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir));
   DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath);
 
   // Instantiate the filter, a DataStructure object and an Arguments Object
@@ -115,10 +115,10 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-2", "[OrientationAnalysis]
 {
   Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
 
-  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars_v2.tar.gz", "PoleFigure_Exemplars_v2");
+  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars_v3.tar.gz", "PoleFigure_Exemplars_v3");
 
   // Read the Small IN100 Data set
-  auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars_v2/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir));
+  auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars_v3/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir));
   DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath);
 
   // Instantiate the filter, a DataStructure object and an Arguments Object
@@ -169,10 +169,10 @@ TEST_CASE("OrientationAnalysis::WritePoleFigureFilter-3", "[OrientationAnalysis]
 {
   Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
 
-  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars_v2.tar.gz", "PoleFigure_Exemplars_v2");
+  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "PoleFigure_Exemplars_v3.tar.gz", "PoleFigure_Exemplars_v3");
 
   // Read the Small IN100 Data set
-  auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars_v2/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir));
+  auto baseDataFilePath = fs::path(fmt::format("{}/PoleFigure_Exemplars_v3/fw-ar-IF1-aptr12-corr.dream3d", unit_test::k_TestFilesDir));
   DataStructure dataStructure = UnitTest::LoadDataStructure(baseDataFilePath);
 
   // Instantiate the filter, a DataStructure object and an Arguments Object

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -33,7 +33,7 @@
         "zlib",
         "zstd"
       ],
-      "baseline": "09bb3d1ffbbcdc3b541d69690ea2b40213ca470a"
+      "baseline": "c9415182598df306f0d3f2f2b354d9d79cf1bf8b"
     }
   ]
 }
diff --git a/vcpkg.json b/vcpkg.json
@@ -74,7 +74,7 @@
       "dependencies": [
         {
           "name": "ebsdlib",
-          "version>=": "1.0.30"
+          "version>=": "1.0.32"
         }
       ]
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ @@
             "zlib",
             "zstd"
           ],
-          "baseline": "09bb3d1ffbbcdc3b541d69690ea2b40213ca470a"
+          "baseline": "c9415182598df306f0d3f2f2b354d9d79cf1bf8b"
         }
       ]
     }