Skip to content

Fix UniversalHermannMauguin dataset parsing in GrainMapper3D reader #1620

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.

Sign up for GitHub

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

Open
nikprabhu wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix UniversalHermannMauguin dataset parsing in GrainMapper3D reader #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de2a305
Fix UniversalHermannMauguin dataset parsing
nikprabhu May 16, 2026
9ce5864
Write UniversalHermannMauguin ensemble metadata
nikprabhu May 20, 2026
6627d4b
Add GM3D ensemble data test against exemplar DREAM3D file
nikprabhu May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...gins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadGrainMapper3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Result<> ReadGrainMapper3D::copyPhaseInformation(GrainMapperReader& reader, hid_
auto& materialNames = m_DataStructure.getDataRefAs<StringArray>(cellEnsembleAMPath.createChildPath(GM3DConstants::k_MaterialName));
auto& latticeConstantsArray = m_DataStructure.getDataRefAs<Float32Array>(cellEnsembleAMPath.createChildPath(GM3DConstants::k_LatticeConstants));
Float32Array::store_type* latticeConstants = latticeConstantsArray.getDataStore();
auto& universalHermannMauguin = m_DataStructure.getDataRefAs<StringArray>(cellEnsembleAMPath.createChildPath(GM3DConstants::k_UniversalHermannMauguin));

crystalStructures[0] = ebsdlib::CrystalStructure::UnknownCrystalStructure;
materialNames[0] = "Invalid Phase";
Expand All @@ -80,6 +81,7 @@ Result<> ReadGrainMapper3D::copyPhaseInformation(GrainMapperReader& reader, hid_
latticeConstants->setComponent(0, 3, 0.0f);
latticeConstants->setComponent(0, 4, 0.0f);
latticeConstants->setComponent(0, 5, 0.0f);
universalHermannMauguin[0] = "Invalid Phase";
int32 index = 1;
for(const auto& phase : phases)
{
Expand All @@ -94,6 +96,8 @@ Result<> ReadGrainMapper3D::copyPhaseInformation(GrainMapperReader& reader, hid_
latticeConstants->setComponent(phaseId, 3, static_cast<float32>(lc[3]));
latticeConstants->setComponent(phaseId, 4, static_cast<float32>(lc[4]));
latticeConstants->setComponent(phaseId, 5, static_cast<float32>(lc[5]));

universalHermannMauguin[phaseId] = phase.UniversalHermannMauguin;
}

return {};
Expand Down
1 change: 1 addition & 0 deletions ...gins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadGrainMapper3D.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ namespace GM3DConstants
const std::string k_CrystalStructures("CrystalStructures");
const std::string k_LatticeConstants("LatticeConstants");
const std::string k_MaterialName("MaterialName");
const std::string k_UniversalHermannMauguin("UniversalHermannMauguin");
} // namespace GM3DConstants
/**
* @class ReadGrainMapper3D
Expand Down
4 changes: 4 additions & 0 deletions src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadGrainMapper3DFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ IFilter::PreflightResult ReadGrainMapper3DFilter::preflightImpl(const DataStruct
auto createArrayAction = std::make_unique<CreateStringArrayAction>(ensembleTupleDims, cellEnsembleAMPath.createChildPath(GM3DConstants::k_MaterialName));
resultOutputActions.value().appendAction(std::move(createArrayAction));
}
{
auto createArrayAction = std::make_unique<CreateStringArrayAction>(ensembleTupleDims, cellEnsembleAMPath.createChildPath(GM3DConstants::k_UniversalHermannMauguin));
resultOutputActions.value().appendAction(std::move(createArrayAction));
}
}

// **************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/GrainMapper3DUtilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ herr_t GrainMapperReader::readPhaseInfo(hid_t parentId)
return error;
}

error = H5Lite::readStringDataset(phaseGid, Constants::k_Name, phase.UniversalHermannMauguin);
error = H5Lite::readStringDataset(phaseGid, Constants::k_UniversalHermannMauguinName, phase.UniversalHermannMauguin);
if(error < 0)
{
return error;
Expand Down
8 changes: 6 additions & 2 deletions src/Plugins/OrientationAnalysis/test/ReadGrainMapper3DTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
args.insertOrAssign(ReadGrainMapper3DFilter::k_ReadLabDCT_Key, std::make_any<bool>(true));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CreatedDCTImageGeometryPath_Key, std::make_any<DataPath>(computedDCTGeometryPath));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CellAttributeMatrixName_Key, std::make_any<std::string>(k_Cell_Data));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any<std::string>(k_EnsembleAttributeMatrix));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any<std::string>(k_Cell_Ensemble_Data));

args.insertOrAssign(ReadGrainMapper3DFilter::k_ConvertPhaseToInt32_Key, std::make_any<bool>(true));
args.insertOrAssign(ReadGrainMapper3DFilter::k_ConvertOrientationData_Key, std::make_any<bool>(true));
Expand Down Expand Up @@ -78,6 +78,8 @@
UnitTest::CompareExemplarToGenerateAttributeMatrix(dataStructure, exemplarDCTGeometryPath.createChildPath(k_Cell_Data), dataStructure, computedDCTGeometryPath.createChildPath(k_Cell_Data));
UnitTest::CompareExemplarToGenerateAttributeMatrix(dataStructure, exemplarAbsorptionCTGeometryPath.createChildPath(k_Cell_Data), dataStructure,
computedAbsorptionCTGeometryPath.createChildPath(k_Cell_Data));
UnitTest::CompareExemplarToGenerateAttributeMatrix(dataStructure, exemplarDCTGeometryPath.createChildPath(k_Cell_Ensemble_Data),

Check failure on line 81 in src/Plugins/OrientationAnalysis/test/ReadGrainMapper3DTest.cpp

View workflow job for this annotation

GitHub Actions / clang_format_pr 

code should be clang-formatted [-Wclang-format-violations]
dataStructure, computedDCTGeometryPath.createChildPath(k_Cell_Ensemble_Data));

Check failure on line 82 in src/Plugins/OrientationAnalysis/test/ReadGrainMapper3DTest.cpp

View workflow job for this annotation

GitHub Actions / clang_format_pr 

code should be clang-formatted [-Wclang-format-violations]

UnitTest::CheckArraysInheritTupleDims(dataStructure);
}
Expand Down Expand Up @@ -110,7 +112,7 @@
args.insertOrAssign(ReadGrainMapper3DFilter::k_ReadLabDCT_Key, std::make_any<bool>(true));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CreatedDCTImageGeometryPath_Key, std::make_any<DataPath>(computedDCTGeometryPath));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CellAttributeMatrixName_Key, std::make_any<std::string>(k_Cell_Data));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any<std::string>(k_EnsembleAttributeMatrix));
args.insertOrAssign(ReadGrainMapper3DFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any<std::string>(k_Cell_Ensemble_Data));

args.insertOrAssign(ReadGrainMapper3DFilter::k_ConvertPhaseToInt32_Key, std::make_any<bool>(false));
args.insertOrAssign(ReadGrainMapper3DFilter::k_ConvertOrientationData_Key, std::make_any<bool>(false));
Expand Down Expand Up @@ -138,6 +140,8 @@
UnitTest::CompareExemplarToGenerateAttributeMatrix(dataStructure, exemplarDCTGeometryPath.createChildPath(k_Cell_Data), dataStructure, computedDCTGeometryPath.createChildPath(k_Cell_Data));
UnitTest::CompareExemplarToGenerateAttributeMatrix(dataStructure, exemplarAbsorptionCTGeometryPath.createChildPath(k_Cell_Data), dataStructure,
computedAbsorptionCTGeometryPath.createChildPath(k_Cell_Data));
UnitTest::CompareExemplarToGenerateAttributeMatrix(dataStructure, exemplarDCTGeometryPath.createChildPath(k_Cell_Ensemble_Data),

Check failure on line 143 in src/Plugins/OrientationAnalysis/test/ReadGrainMapper3DTest.cpp

View workflow job for this annotation

GitHub Actions / clang_format_pr 

code should be clang-formatted [-Wclang-format-violations]
dataStructure, computedDCTGeometryPath.createChildPath(k_Cell_Ensemble_Data));

Check failure on line 144 in src/Plugins/OrientationAnalysis/test/ReadGrainMapper3DTest.cpp

View workflow job for this annotation

GitHub Actions / clang_format_pr 

code should be clang-formatted [-Wclang-format-violations]

UnitTest::CheckArraysInheritTupleDims(dataStructure);
}
Loading