From 9d7c4e459e7a2a85ca1081090f56d24249eab770 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Wed, 1 May 2024 12:04:32 -0400 Subject: [PATCH] BUG: ReadCTFData-Remove phase=0 value adjustment. (#937) There was a long-standing piece of code that added 1 to the phase value if the phase value was zero. This is not needed and can affect results being put out by DREAM3D. Other changes in this PR were related to bringing consistency to the Parameter::Separator values for the 7 different filters to read EBSD data. Each of the filters should now present a consistent terminology to the user and be laid out the same. Signed-off-by: Michael Jackson --- .../docs/ReadCtfDataFilter.md | 2 +- .../Filters/Algorithms/ReadCtfData.cpp | 16 +--------------- .../Filters/ReadAngDataFilter.cpp | 17 ++++++++++------- .../Filters/ReadCtfDataFilter.cpp | 17 ++++++++++------- .../Filters/ReadH5EbsdFilter.cpp | 18 +++++++++--------- .../Filters/ReadH5EspritDataFilter.cpp | 19 ++++++++++--------- .../Filters/ReadH5EspritDataFilter.hpp | 2 +- .../Filters/ReadH5OimDataFilter.cpp | 9 +++++---- .../Filters/ReadH5OinaDataFilter.cpp | 9 +++++---- .../OrientationAnalysis/test/CMakeLists.txt | 2 +- .../test/ReadCtfDataTest.cpp | 6 +++--- .../test/ReadH5EspritDataTest.cpp | 4 ++-- 12 files changed, 58 insertions(+), 63 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/docs/ReadCtfDataFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadCtfDataFilter.md index f17c18fcb6..56eeead1f1 100644 --- a/src/Plugins/OrientationAnalysis/docs/ReadCtfDataFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/ReadCtfDataFilter.md @@ -55,4 +55,4 @@ Please see the description file distributed with this **Plugin** ## DREAM3D-NX Help -If you need help, need to file a bug report or want to request a new feature, please head over to the [DREAM3DNX-Issues](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues/discussions) GItHub site where the community of DREAM3D-NX users can help answer your questions. +If you need help, need to file a bug report or want to request a new feature, please head over to the [DREAM3DNX-Issues](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues/discussions) GItHub site where the community of DREAM3D-NX users can help answer your questions. \ No newline at end of file diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp index 261939cd5c..b0b2da0c1e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp @@ -109,26 +109,12 @@ void ReadCtfData::copyRawEbsdData(CtfReader* reader) const // Prepare the Cell Attribute Matrix with the correct number of tuples based on the total Cells being read from the file. std::vector tDims = {imageGeom.getNumXCells(), imageGeom.getNumYCells(), imageGeom.getNumZCells()}; - // Adjust the values of the 'phase' data to correct for invalid values and assign the read Phase Data into the actual DataArray + // Copy the Phase Array { - /* Take from H5CtfVolumeReader.cpp - * For HKL OIM Files if there is a single phase then the value of the phase - * data is one (1). If there are 2 or more phases, the lowest value - * of phase is also one (1). However, if there are "zero solutions" in the data - * then those Cells are assigned a phase of zero. Since those Cells can be identified - * by other methods, the phase of these Cells should be changed to one since in the rest - * of the reconstruction code we follow the convention that the lowest value is One (1) - * even if there is only a single phase. The next if statement converts all zeros to ones - * if there is a single phase in the OIM data. - */ auto& targetArray = m_DataStructure.getDataRefAs(cellAttributeMatrixPath.createChildPath(EbsdLib::CtfFile::Phases)); int* phasePtr = reinterpret_cast(reader->getPointerByName(EbsdLib::Ctf::Phase)); for(size_t i = 0; i < totalCells; i++) { - if(phasePtr[i] < 1) - { - phasePtr[i] = 1; - } targetArray[i] = phasePtr[i]; } } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp index 876fc62235..08033e9494 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp @@ -62,13 +62,16 @@ Parameters ReadAngDataFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_InputFile_Key, "Input File", "The input .ang file path", fs::path("input.ang"), FileSystemPathParameter::ExtensionsType{".ang"}, FileSystemPathParameter::PathType::InputFile)); - params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); - params.insert( - std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The complete path to the Geometry being created.", DataPath({"DataContainer"}))); - params.insert( - std::make_unique(k_CellAttributeMatrixName_Key, "Created Cell Attribute Matrix", "The Attribute Matrix where the scan data is stored.", ImageGeom::k_CellDataName)); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Created Cell Ensemble Attribute Matrix", - "The Attribute Matrix where the phase information is stored.", "CellEnsembleData")); + params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); + params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + + params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", + ImageGeom::k_CellDataName)); + params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", + "Cell Ensemble Data")); return params; } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp index e4938d7366..a9e95e2521 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp @@ -69,13 +69,16 @@ Parameters ReadCtfDataFilter::parameters() const params.insert(std::make_unique(k_EdaxHexagonalAlignment_Key, "Convert Hexagonal X-Axis to EDAX Standard", "Whether or not to convert a Hexagonal phase to the EDAX standard for x-axis alignment", false)); - params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); - params.insert( - std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The complete path to the Geometry being created.", DataPath({"DataContainer"}))); - params.insert( - std::make_unique(k_CellAttributeMatrixName_Key, "Created Cell Attribute Matrix", "The Attribute Matrix where the scan data is stored.", ImageGeom::k_CellDataName)); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Created Cell Ensemble Attribute Matrix", - "The Attribute Matrix where the phase information is stored.", "CellEnsembleData")); + params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); + params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + + params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", + ImageGeom::k_CellDataName)); + params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", + "Cell Ensemble Data")); return params; } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index 39f039facd..ea81f7986f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -4,6 +4,7 @@ #include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" #include "simplnx/DataStructure/DataPath.hpp" +#include "simplnx/DataStructure/Geometry/ImageGeom.hpp" #include "simplnx/Filter/Actions/CreateArrayAction.hpp" #include "simplnx/Filter/Actions/CreateAttributeMatrixAction.hpp" #include "simplnx/Filter/Actions/CreateImageGeometryAction.hpp" @@ -62,15 +63,14 @@ Parameters ReadH5EbsdFilter::parameters() const params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", ReadH5EbsdFileParameter::ValueType{})); - params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); - params.insert( - std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); - // params.insertSeparator(Parameters::Separator{"Cell Data"}); - params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Created Cell Attribute Matrix", - "The name of the created cell attribute matrix associated with the imported geometry", "CellData")); - // params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Created Cell Ensemble Attribute Matrix", - "The name of the created cell ensemble attribute matrix associated with the imported geometry", "CellEnsembleData")); + params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); + params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the created cell attribute matrix associated with the imported geometry", + ImageGeom::k_CellDataName)); + params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", + "Cell Ensemble Data")); return params; } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp index 9cc162b63b..8d8e0e0a38 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp @@ -66,7 +66,7 @@ Parameters ReadH5EspritDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_SelectedScanNames_Key, "Scan Names", "The name of the scan in the .h5 file. Esprit can store multiple scans in a single file", + params.insert(std::make_unique(k_SelectedScanNames_Key, "Scan Names", "The name of the scan(s) in the .h5 file. Esprit can store multiple scans in a single file", OEMEbsdScanSelectionParameter::ValueType{}, /* OEMEbsdScanSelectionParameter::AllowedManufacturers{EbsdLib::OEM::Bruker, EbsdLib::OEM::DREAM3D},*/ OEMEbsdScanSelectionParameter::EbsdReaderType::Esprit, OEMEbsdScanSelectionParameter::ExtensionsType{".h5", ".hdf5"})); @@ -74,13 +74,14 @@ Parameters ReadH5EspritDataFilter::parameters() const params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_DegreesToRadians_Key, "Convert Euler Angles to Radians", "Whether or not to convert the euler angles to radians", true)); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); - params.insert(std::make_unique(k_ImageGeometryName_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Cell Data"}); + params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); + params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Cell Ensemble Attribute Matrix", - "The name of the cell ensemble data attribute matrix for the created Image Geometry", "Cell Ensemble Data")); + params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", + "Cell Ensemble Data")); return params; } @@ -100,7 +101,7 @@ IFilter::PreflightResult ReadH5EspritDataFilter::preflightImpl(const DataStructu auto pOriginValue = filterArgs.value(k_Origin_Key); auto pDegreesToRadiansValue = filterArgs.value(k_DegreesToRadians_Key); auto pReadPatternDataValue = filterArgs.value(k_ReadPatternData_Key); - auto pImageGeometryNameValue = filterArgs.value(k_ImageGeometryName_Key); + auto pImageGeometryNameValue = filterArgs.value(k_CreatedImageGeometryPath_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = filterArgs.value(k_CellEnsembleAttributeMatrixName_Key); @@ -213,7 +214,7 @@ Result<> ReadH5EspritDataFilter::executeImpl(DataStructure& dataStructure, const inputValues.SelectedScanNames = filterArgs.value(k_SelectedScanNames_Key); inputValues.ReadPatternData = filterArgs.value(k_ReadPatternData_Key); - inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryName_Key); + inputValues.ImageGeometryPath = filterArgs.value(k_CreatedImageGeometryPath_Key); inputValues.CellEnsembleAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); inputValues.CellAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellAttributeMatrixName_Key)); espritInputValues.DegreesToRadians = filterArgs.value(k_DegreesToRadians_Key); @@ -251,7 +252,7 @@ Result ReadH5EspritDataFilter::FromSIMPLJson(const nlohmann::json& js // results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CombineEulerAnglesKey, )); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DegreesToRadiansKey, k_DegreesToRadians_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ReadPatternDataKey, k_ReadPatternData_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_ImageGeometryName_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_DataContainerNameKey, k_CreatedImageGeometryPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellAttributeMatrixNameKey, k_CellAttributeMatrixName_Key)); results.push_back( SIMPLConversion::ConvertParameter(args, json, SIMPL::k_CellEnsembleAttributeMatrixNameKey, k_CellEnsembleAttributeMatrixName_Key)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp index 80aeaf9e36..47264f6e7e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp @@ -29,7 +29,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataFilter : public IFilter static inline constexpr StringLiteral k_Origin_Key = "origin"; static inline constexpr StringLiteral k_DegreesToRadians_Key = "degrees_to_radians"; static inline constexpr StringLiteral k_ReadPatternData_Key = "read_pattern_data"; - static inline constexpr StringLiteral k_ImageGeometryName_Key = "output_image_geometry_path"; + static inline constexpr StringLiteral k_CreatedImageGeometryPath_Key = "output_image_geometry_path"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index 72c5c8ebc2..df60b1e3e9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -70,13 +70,14 @@ Parameters ReadH5OimDataFilter::parameters() const params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing in microns between each layer.", 1.0f)); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); + params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Cell Data"}); + params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Cell Ensemble Attribute Matrix", - "The name of the cell ensemble data attribute matrix for the created Image Geometry", "Cell Ensemble Data")); + params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", + "Cell Ensemble Data")); return params; } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp index 958ed06b44..a08481e7e5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp @@ -72,13 +72,14 @@ Parameters ReadH5OinaDataFilter::parameters() const params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing in microns between each layer.", 1.0f)); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); + params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Cell Data"}); + params.insertSeparator(Parameters::Separator{"Created Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); - params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Cell Ensemble Attribute Matrix", - "The name of the cell ensemble data attribute matrix for the created Image Geometry", "Cell Ensemble Data")); + params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", + "Cell Ensemble Data")); return params; } diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt index b0ea154fd1..b0f68842e7 100644 --- a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt @@ -134,7 +134,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME so3_cubic_high_ipf_001.tar.gz SHA512 dfe4598cd4406e8b83f244302dc4fe0d4367527835c5ddd6567fe8d8ab3484d5b10ba24a8bb31db269256ec0b5272daa4340eedb5a8b397755541b32dd616b85) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME feature_boundary_neighbor_slip_transmission.tar.gz SHA512 fb4a92bdfcff1f2b167cdce2126087e76c9022deb0f0bd8a658482f88f8593bacc0e23b8056d56390f767bc1dd21912fb01a976e3cb670738f1a39d46ad9ef28) 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.tar.gz SHA512 e7ac4706d22574396aaa5d67b2a2b4e32db5005e841d3b6dafad65c74615441c028e4cba0ce0721c8929dace495afd6ef844585e2ce6d3b092582a258befd7c2) + download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ctf_data_2.tar.gz SHA512 f397fa3bf457615a90a4b48eaafded2aa4952b41ccb28d9da6a83adc38aea9c22f2bb5a955f251edeca9ef8265b6bf1d74e829b1340f45cf52620a237aad1707) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME write_stats_gen_odf_angle_file.tar.gz SHA512 be3f663aae1f78e5b789200421534ed9fe293187ec3514796ac8177128b34ded18bb9a98b8e838bb283f9818ac30dc4b19ec379bdd581b1a98eb36d967cdd319) 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 convert_hex_grid_to_square_grid_test.tar.gz SHA512 bb672ebbe2540ba493ad95bea95dac1f85b5634ac3311b5aa774ce3d2177103d1b45a13225221993dd40f0cbe02daf20ccd209d4ae0cab0bf034d97c5b234ba4) diff --git a/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp index 689138f6e7..d24d753036 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadCtfDataTest.cpp @@ -18,10 +18,10 @@ TEST_CASE("OrientationAnalysis::ReadCtfData: Valid Execution", "[OrientationAnal { 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_read_ctf_data.tar.gz", "6_6_read_ctf_data"); + const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_read_ctf_data_2.tar.gz", "6_6_read_ctf_data_2"); // Read Exemplar DREAM3D File - auto exemplarFilePath = fs::path(fmt::format("{}/6_6_read_ctf_data/6_6_read_ctf_data.dream3d", unit_test::k_TestFilesDir)); + auto exemplarFilePath = fs::path(fmt::format("{}/6_6_read_ctf_data_2/6_6_read_ctf_data.dream3d", unit_test::k_TestFilesDir)); DataStructure exemplarDataStructure = LoadDataStructure(exemplarFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object @@ -29,7 +29,7 @@ TEST_CASE("OrientationAnalysis::ReadCtfData: Valid Execution", "[OrientationAnal DataStructure dataStructure; Arguments args; - const fs::path inputCtfFile(fmt::format("{}/6_6_read_ctf_data/Cugrid_after 2nd_15kv_2kx_2.ctf", unit_test::k_TestFilesDir)); + const fs::path inputCtfFile(fmt::format("{}/6_6_read_ctf_data_2/Cugrid_after 2nd_15kv_2kx_2.ctf", unit_test::k_TestFilesDir)); // Create default Parameters for the filter. args.insertOrAssign(ReadCtfDataFilter::k_InputFile_Key, std::make_any(inputCtfFile)); diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp index 13eea1fb0a..4f91556b3f 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp @@ -47,7 +47,7 @@ TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: Valid Filter Execution", args.insertOrAssign(ReadH5EspritDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); args.insertOrAssign(ReadH5EspritDataFilter::k_DegreesToRadians_Key, std::make_any(true)); args.insertOrAssign(ReadH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); - args.insertOrAssign(ReadH5EspritDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5EspritDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); args.insertOrAssign(ReadH5EspritDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadH5EspritDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); @@ -93,7 +93,7 @@ TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: InValid Filter Execution Arguments args; args.insertOrAssign(ReadH5EspritDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); args.insertOrAssign(ReadH5EspritDataFilter::k_DegreesToRadians_Key, std::make_any(true)); - args.insertOrAssign(ReadH5EspritDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5EspritDataFilter::k_CreatedImageGeometryPath_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); args.insertOrAssign(ReadH5EspritDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); args.insertOrAssign(ReadH5EspritDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData));