Skip to content

Commit

Permalink
ENH: Update 'DataContainer/CellData' to 'DataContainer/Cell Data'
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Jackson <[email protected]>
  • Loading branch information
@imikejackson
imikejackson committed May 21, 2024
1 parent 7bae431 commit 318d3d2
Show file tree
Hide file tree
Showing 42 changed files with 3,990 additions and 436 deletions.
4 changes: 2 additions & 2 deletions src/Plugins/OrientationAnalysis/docs/ReadH5OinaDataFilter.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ All orientation data in the H5OINA file are in radians.
| Kind | Default Name | Type | Comp Dims | Description |
|-------------|--------------|------|-----------|----------------------------------------|
| Data Container | ImageDataContainer | N/A | N/A | Created Data Container name with an **Image Geometry** |
| Attribute Matrix | CellData | Cell | N/A | Created **Cell Attribute Matrix** name |
| Attribute Matrix | CellEnsembleData | Cell Ensemble | N/A | Created **Cell Ensemble Attribute Matrix** name |
| Attribute Matrix | Cell Data | Cell | N/A | Created **Cell Attribute Matrix** name |
| Attribute Matrix | Cell Ensemble Data | Cell Ensemble | N/A | Created **Cell Ensemble Attribute Matrix** name |
| Cell Attribute Array | Band Contrast | uint8 | (1) | |
| Cell Attribute Array | Band Slope | uint8 | (1) | |
| Cell Attribute Array | Bands | uint8 | (1) | |
Expand Down
82 changes: 41 additions & 41 deletions src/Plugins/OrientationAnalysis/pipelines/ComputeGBCD-GBPDMetricBased.d3dpipeline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -56,15 +56,15 @@
"TriangleDataContainer/SharedTriList",
"TriangleDataContainer/SharedVertexList",
"TriangleDataContainer/FaceData",
"TriangleDataContainer/VertexData",
"TriangleDataContainer/FaceData/FaceLabels",
"TriangleDataContainer/VertexData/NodeType",
"TriangleDataContainer/Vertex Data",
"TriangleDataContainer/Face Data/FaceLabels",
"TriangleDataContainer/Vertex Data/NodeType",
"TriangleDataContainer/Edge List",
"TriangleDataContainer/FaceData/FaceAreas",
"TriangleDataContainer/FaceData/FaceNormals",
"TriangleDataContainer/FaceData/FaceDihedralAngles",
"TriangleDataContainer/FaceData/FaceIPFColors",
"TriangleDataContainer/FaceData/FaceMisorientationColors"
"TriangleDataContainer/Face Data/FaceAreas",
"TriangleDataContainer/Face Data/FaceNormals",
"TriangleDataContainer/Face Data/FaceDihedralAngles",
"TriangleDataContainer/Face Data/FaceIPFColors",
"TriangleDataContainer/Face Data/FaceMisorientationColors"
],
"file_path": "Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d"
},
Expand All @@ -77,7 +77,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -125,9 +125,9 @@
"TriangleDataContainer/SharedTriList",
"TriangleDataContainer/SharedVertexList",
"TriangleDataContainer/FaceData",
"TriangleDataContainer/VertexData",
"TriangleDataContainer/FaceData/FaceLabels",
"TriangleDataContainer/VertexData/NodeType",
"TriangleDataContainer/Vertex Data",
"TriangleDataContainer/Face Data/FaceLabels",
"TriangleDataContainer/Vertex Data/NodeType",
"TriangleDataContainer/Edge List"
],
"file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d"
Expand All @@ -141,7 +141,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -189,9 +189,9 @@
"TriangleDataContainer/SharedTriList",
"TriangleDataContainer/SharedVertexList",
"TriangleDataContainer/FaceData",
"TriangleDataContainer/VertexData",
"TriangleDataContainer/FaceData/FaceLabels",
"TriangleDataContainer/VertexData/NodeType"
"TriangleDataContainer/Vertex Data",
"TriangleDataContainer/Face Data/FaceLabels",
"TriangleDataContainer/Vertex Data/NodeType"
],
"file_path": "Data/Output/SurfaceMesh/SmallIN100_Mesh.dream3d"
},
Expand All @@ -204,7 +204,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -264,7 +264,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -315,7 +315,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -461,7 +461,7 @@
"alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt",
"mask_array_path": "DataContainer/Cell Data/Mask",
"reference_slice": 0,
"selected_cell_data_path": "DataContainer/CellData",
"selected_cell_data_path": "DataContainer/Cell Data",
"input_image_geometry_path": "DataContainer",
"use_reference_slice": true,
"write_alignment_shifts": false
Expand Down Expand Up @@ -661,7 +661,7 @@
{
"args": {
"apply_to_single_phase": false,
"cell_attribute_matrix_path": "DataContainer/CellData",
"cell_attribute_matrix_path": "DataContainer/Cell Data",
"feature_ids_path": "DataContainer/Cell Data/FeatureIds",
"feature_phases_path": "Data Container/Feature Data/Phases",
"ignored_voxel_arrays": [],
Expand Down Expand Up @@ -1006,7 +1006,7 @@
"feature_avg_misorientations_array_name": "FeatureAvgMisorientations",
"feature_ids_path": "DataContainer/Cell Data/FeatureIds",
"feature_reference_misorientations_array_name": "FeatureReferenceMisorientations",
"gb_euclidean_distances_array_path": "CellData/GBEuclideanDistances",
"gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances",
"quats_array_path": "DataContainer/Cell Data/Quats",
"reference_orientation_index": 0
},
Expand Down Expand Up @@ -1101,7 +1101,7 @@
},
{
"args": {
"face_data_group_name": "FaceData",
"face_data_group_name": "Face Data",
"face_feature_attribute_matrix_name": "Face Feature Data",
"face_labels_array_name": "FaceLabels",
"feature_ids_path": "DataContainer/Cell Data/FeatureIds",
Expand All @@ -1111,7 +1111,7 @@
"node_types_array_name": "NodeType",
"input_data_array_paths": [],
"output_triangle_geometry_path": "TriangleDataContainer",
"vertex_data_group_name": "VertexData"
"vertex_data_group_name": "Vertex Data"
},
"comments": "",
"filter": {
Expand Down Expand Up @@ -1148,7 +1148,7 @@
"lambda_value": 0.25,
"mu_factor": 0.20000000298023224,
"quad_point_lambda": 0.15000000596046448,
"surface_mesh_node_type_array_path": "TriangleDataContainer/VertexData/NodeType",
"surface_mesh_node_type_array_path": "TriangleDataContainer/Vertex Data/NodeType",
"surface_point_lambda": 0.0,
"surface_quad_point_lambda": 0.0,
"surface_triple_line_lambda": 0.0,
Expand Down Expand Up @@ -1227,8 +1227,8 @@
"feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AvgEulerAngles",
"feature_phases_array_path": "DataContainer/Cell Feature Data/Phases",
"surface_mesh_face_ipf_colors_array_name": "FaceIPFColors",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels",
"surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals"
"surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels",
"surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals"
},
"comments": "",
"filter": {
Expand All @@ -1242,7 +1242,7 @@
"avg_quats_array_path": "DataContainer/Cell Feature Data/AvgQuats",
"crystal_structures_array_path": "DataContainer/Cell Ensemble Data/CrystalStructures",
"feature_phases_array_path": "DataContainer/Cell Feature Data/Phases",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels",
"surface_mesh_face_misorientation_colors_array_name": "FaceMisorientationColors"
},
"comments": "",
Expand Down Expand Up @@ -1276,11 +1276,11 @@
},
{
"args": {
"face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels",
"face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels",
"feature_face_ids_array_name": "FeatureFaceId",
"feature_face_labels_array_name": "FaceLabels",
"feature_num_triangles_array_name": "NumTriangles",
"grain_boundary_attribute_matrix_name": "FaceFeatureData",
"grain_boundary_attribute_matrix_name": "Face Feature Data",
"input_triangle_geometry_path": "TriangleDataContainer"
},
"comments": "",
Expand All @@ -1305,14 +1305,14 @@
1.0,
17.899999618530273
],
"node_types_array_path": "TriangleDataContainer/VertexData/NodeType",
"node_types_array_path": "TriangleDataContainer/Vertex Data/NodeType",
"num_sampl_pts": 3000,
"phase_of_interest": 1,
"save_relative_err": true,
"surface_mesh_face_areas_array_path": "TriangleDataContainer/FaceData/FaceAreas",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels",
"surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals",
"surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/FaceFeatureData/FaceLabels",
"surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels",
"surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals",
"surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/Face Feature Data/FaceLabels",
"input_triangle_geometry_path": "TriangleDataContainer"
},
"comments": "",
Expand All @@ -1331,14 +1331,14 @@
"feature_euler_angles_array_path": "DataContainer/Cell Feature Data/AxisEulerAngles",
"feature_phases_array_path": "DataContainer/Cell Feature Data/Phases",
"limit_dist": 7.0,
"node_types_array_path": "TriangleDataContainer/VertexData/NodeType",
"node_types_array_path": "TriangleDataContainer/Vertex Data/NodeType",
"num_sampl_pts": 3000,
"phase_of_interest": 1,
"save_relative_err": false,
"surface_mesh_face_areas_array_path": "TriangleDataContainer/FaceData/FaceAreas",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/FaceData/FaceLabels",
"surface_mesh_face_normals_array_path": "TriangleDataContainer/FaceData/FaceNormals",
"surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/FaceFeatureData/FaceLabels",
"surface_mesh_face_areas_array_path": "TriangleDataContainer/Face Data/FaceAreas",
"surface_mesh_face_labels_array_path": "TriangleDataContainer/Face Data/FaceLabels",
"surface_mesh_face_normals_array_path": "TriangleDataContainer/Face Data/FaceNormals",
"surface_mesh_feature_face_labels_array_path": "TriangleDataContainer/Face Feature Data/FaceLabels",
"input_triangle_geometry_path": "TriangleDataContainer"
},
"comments": "",
Expand Down
4 changes: 2 additions & 2 deletions ...onAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"input_image_geometry_path": "DataContainer",
"mask_array_path": "DataContainer/Cell Data/Mask",
"reference_slice": 0,
"selected_cell_data_path": "DataContainer/CellData",
"selected_cell_data_path": "DataContainer/Cell Data",
"use_reference_slice": true,
"write_alignment_shifts": false
},
Expand Down Expand Up @@ -339,7 +339,7 @@
{
"args": {
"apply_to_single_phase": false,
"cell_attribute_matrix_path": "DataContainer/CellData",
"cell_attribute_matrix_path": "DataContainer/Cell Data",
"feature_ids_path": "DataContainer/Cell Data/FeatureIds",
"feature_phases_path": "Data Container/Feature Data/Phases",
"ignored_voxel_arrays": [],
Expand Down
3 changes: 1 addition & 2 deletions ...nAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"DataContainer/Cell Ensemble Data/CrystalStructures",
"DataContainer/Cell Ensemble Data/LatticeConstants",
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/EulerAngles",
"DataContainer/Cell Data/Fit",
Expand All @@ -26,7 +26,6 @@
"DataContainer/Cell Feature Data/Phases",
"DataContainer/Cell Feature Data/AvgQuats",
"DataContainer/Cell Feature Data/AvgEulerAngles",

"DataContainer/NewGrain Data",
"DataContainer/Cell Data/ParentIds",
"DataContainer/Cell Feature Data/ParentIds",
Expand Down
22 changes: 5 additions & 17 deletions ...alysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand All @@ -24,7 +24,6 @@
"DataContainer/Cell Feature Data/Active",
"DataContainer/Cell Data/FeatureIds",
"DataContainer/Cell Feature Data/Phases",

"DataContainer/NewGrain Data",
"DataContainer/Cell Data/ParentIds",
"DataContainer/Cell Feature Data/ParentIds",
Expand Down Expand Up @@ -59,7 +58,7 @@
"import_data_object": {
"data_paths": [
"DataContainer",
"DataContainer/CellData",
"DataContainer/Cell Data",
"DataContainer/Cell Data/Image Quality",
"DataContainer/Cell Data/Confidence Index",
"DataContainer/Cell Data/SEM Signal",
Expand Down Expand Up @@ -205,7 +204,7 @@
"alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt",
"mask_array_path": "DataContainer/Cell Data/Mask",
"reference_slice": 0,
"selected_cell_data_path": "DataContainer/CellData",
"selected_cell_data_path": "DataContainer/Cell Data",
"input_image_geometry_path": "DataContainer",
"use_reference_slice": true,
"write_alignment_shifts": false
Expand Down Expand Up @@ -405,7 +404,7 @@
{
"args": {
"apply_to_single_phase": false,
"cell_attribute_matrix_path": "DataContainer/CellData",
"cell_attribute_matrix_path": "DataContainer/Cell Data",
"feature_ids_path": "DataContainer/Cell Data/FeatureIds",
"feature_phases_path": "Data Container/Feature Data/Phases",
"ignored_voxel_arrays": [],
Expand Down Expand Up @@ -661,17 +660,6 @@
},
"isDisabled": false
},
{
"args": {
"removed_data_path": []
},
"comments": "",
"filter": {
"name": "simplnx::DeleteDataFilter",
"uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606"
},
"isDisabled": true
},
{
"args": {
"avg_euler_angles_array_name": "AvgEulerAngles",
Expand Down Expand Up @@ -750,7 +738,7 @@
"feature_avg_misorientations_array_name": "FeatureAvgMisorientations",
"feature_ids_path": "DataContainer/Cell Data/FeatureIds",
"feature_reference_misorientations_array_name": "FeatureReferenceMisorientations",
"gb_euclidean_distances_array_path": "CellData/GBEuclideanDistances",
"gb_euclidean_distances_array_path": "Cell Data/GBEuclideanDistances",
"quats_array_path": "DataContainer/Cell Data/Quats",
"reference_orientation_index": 0
},
Expand Down
Loading

0 comments on commit 318d3d2

Please sign in to comment.