Skip to content

Commit 9ce5864

Browse files
nikprabhuimikejackson
authored andcommitted
Write UniversalHermannMauguin ensemble metadata
1 parent de2a305 commit 9ce5864

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadGrainMapper3D.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Result<> ReadGrainMapper3D::copyPhaseInformation(GrainMapperReader& reader, hid_
7171
auto& materialNames = m_DataStructure.getDataRefAs<StringArray>(cellEnsembleAMPath.createChildPath(GM3DConstants::k_MaterialName));
7272
auto& latticeConstantsArray = m_DataStructure.getDataRefAs<Float32Array>(cellEnsembleAMPath.createChildPath(GM3DConstants::k_LatticeConstants));
7373
Float32Array::store_type* latticeConstants = latticeConstantsArray.getDataStore();
74+
auto& universalHermannMauguin = m_DataStructure.getDataRefAs<StringArray>(cellEnsembleAMPath.createChildPath(GM3DConstants::k_UniversalHermannMauguin));
7475

7576
crystalStructures[0] = ebsdlib::CrystalStructure::UnknownCrystalStructure;
7677
materialNames[0] = "Invalid Phase";
@@ -80,6 +81,7 @@ Result<> ReadGrainMapper3D::copyPhaseInformation(GrainMapperReader& reader, hid_
8081
latticeConstants->setComponent(0, 3, 0.0f);
8182
latticeConstants->setComponent(0, 4, 0.0f);
8283
latticeConstants->setComponent(0, 5, 0.0f);
84+
universalHermannMauguin[0] = "Invalid Phase";
8385
int32 index = 1;
8486
for(const auto& phase : phases)
8587
{
@@ -94,6 +96,8 @@ Result<> ReadGrainMapper3D::copyPhaseInformation(GrainMapperReader& reader, hid_
9496
latticeConstants->setComponent(phaseId, 3, static_cast<float32>(lc[3]));
9597
latticeConstants->setComponent(phaseId, 4, static_cast<float32>(lc[4]));
9698
latticeConstants->setComponent(phaseId, 5, static_cast<float32>(lc[5]));
99+
100+
universalHermannMauguin[phaseId] = phase.UniversalHermannMauguin;
97101
}
98102

99103
return {};

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadGrainMapper3D.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ namespace GM3DConstants
3535
const std::string k_CrystalStructures("CrystalStructures");
3636
const std::string k_LatticeConstants("LatticeConstants");
3737
const std::string k_MaterialName("MaterialName");
38+
const std::string k_UniversalHermannMauguin("UniversalHermannMauguin");
3839
} // namespace GM3DConstants
3940
/**
4041
* @class ReadGrainMapper3D

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadGrainMapper3DFilter.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,10 @@ IFilter::PreflightResult ReadGrainMapper3DFilter::preflightImpl(const DataStruct
233233
auto createArrayAction = std::make_unique<CreateStringArrayAction>(ensembleTupleDims, cellEnsembleAMPath.createChildPath(GM3DConstants::k_MaterialName));
234234
resultOutputActions.value().appendAction(std::move(createArrayAction));
235235
}
236+
{
237+
auto createArrayAction = std::make_unique<CreateStringArrayAction>(ensembleTupleDims, cellEnsembleAMPath.createChildPath(GM3DConstants::k_UniversalHermannMauguin));
238+
resultOutputActions.value().appendAction(std::move(createArrayAction));
239+
}
236240
}
237241

238242
// **************************************************************************

0 commit comments

Comments
 (0)