Skip to content

Commit

Permalink
Fix prebuilt pipeline.
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Jackson <[email protected]>
  • Loading branch information
@imikejackson
imikejackson committed Apr 25, 2024
1 parent 7ca27a3 commit 91a6501
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 42 deletions.
108 changes: 70 additions & 38 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 @@ -28,7 +28,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::ReadH5EbsdFilter",
"name": "nx::core::ReadH5EbsdFilter",
"uuid": "db291b6c-9aaf-432d-9547-430c865a539c"
},
"isDisabled": false
Expand Down Expand Up @@ -58,11 +58,16 @@
"type": "collection",
"union": 0
},
"output_data_array_name": "Mask"
"created_mask_type": 10,
"custom_false_value": 0.0,
"custom_true_value": 1.0,
"output_data_array_name": "Mask",
"use_custom_false_value": false,
"use_custom_true_value": false
},
"comments": "",
"filter": {
"name": "simplnx::MultiThresholdObjects",
"name": "nx::core::MultiThresholdObjects",
"uuid": "4246245e-1011-4add-8436-0af6bed19228"
},
"isDisabled": false
Expand All @@ -76,7 +81,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::ConvertOrientations",
"name": "nx::core::ConvertOrientations",
"uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b"
},
"isDisabled": false
Expand All @@ -86,46 +91,46 @@
"alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt",
"cell_phases_array_path": "DataContainer/CellData/Phases",
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
"input_image_geometry_path": "DataContainer",
"mask_array_path": "DataContainer/CellData/Mask",
"misorientation_tolerance": 5.0,
"quats_array_path": "DataContainer/CellData/Quats",
"input_image_geometry_path": "DataContainer",
"use_mask": true,
"write_alignment_shifts": false
},
"comments": "",
"filter": {
"name": "simplnx::AlignSectionsMisorientationFilter",
"name": "nx::core::AlignSectionsMisorientationFilter",
"uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced"
},
"isDisabled": false
},
{
"args": {
"fill_holes": false,
"mask_array_path": "DataContainer/CellData/Mask",
"input_image_geometry_path": "DataContainer"
"input_image_geometry_path": "DataContainer",
"mask_array_path": "DataContainer/CellData/Mask"
},
"comments": "",
"filter": {
"name": "simplnx::IdentifySample",
"name": "nx::core::IdentifySample",
"uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273"
},
"isDisabled": false
},
{
"args": {
"alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt",
"input_image_geometry_path": "DataContainer",
"mask_array_path": "DataContainer/CellData/Mask",
"reference_slice": 0,
"selected_cell_data_path": "DataContainer/CellData",
"input_image_geometry_path": "DataContainer",
"use_reference_slice": true,
"write_alignment_shifts": false
},
"comments": "",
"filter": {
"name": "simplnx::AlignSectionsFeatureCentroidFilter",
"name": "nx::core::AlignSectionsFeatureCentroidFilter",
"uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452"
},
"isDisabled": false
Expand All @@ -134,15 +139,15 @@
"args": {
"cell_phases_array_path": "DataContainer/CellData/Phases",
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
"mask_array_path": "DataContainer/CellData/Mask",
"input_image_geometry_path": "DataContainer",
"mask_array_path": "DataContainer/CellData/Mask",
"misorientation_tolerance": 5.0,
"number_of_neighbors": 4,
"quats_array_path": "DataContainer/CellData/Quats"
},
"comments": "",
"filter": {
"name": "simplnx::BadDataNeighborOrientationCheckFilter",
"name": "nx::core::BadDataNeighborOrientationCheckFilter",
"uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3"
},
"isDisabled": false
Expand All @@ -161,7 +166,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::NeighborOrientationCorrelationFilter",
"name": "nx::core::NeighborOrientationCorrelationFilter",
"uuid": "4625c192-7e46-4333-a294-67a2eb64cb37"
},
"isDisabled": false
Expand All @@ -170,19 +175,19 @@
"args": {
"active_array_name": "Active",
"cell_feature_attribute_matrix_name": "CellFeatureData",
"cell_mask_array_path": "DataContainer/CellData/Mask",
"cell_phases_array_path": "DataContainer/CellData/Phases",
"cell_quats_array_path": "DataContainer/CellData/Quats",
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
"feature_ids_array_name": "FeatureIds",
"cell_mask_array_path": "DataContainer/CellData/Mask",
"input_image_geometry_path": "DataContainer",
"misorientation_tolerance": 5.0,
"cell_quats_array_path": "DataContainer/CellData/Quats",
"randomize_features": true,
"use_mask": true
},
"comments": "",
"filter": {
"name": "simplnx::EBSDSegmentFeaturesFilter",
"name": "nx::core::EBSDSegmentFeaturesFilter",
"uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0"
},
"isDisabled": false
Expand All @@ -196,7 +201,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::FindFeaturePhasesFilter",
"name": "nx::core::FindFeaturePhasesFilter",
"uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc"
},
"isDisabled": false
Expand All @@ -213,7 +218,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::FindAvgOrientationsFilter",
"name": "nx::core::FindAvgOrientationsFilter",
"uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e"
},
"isDisabled": false
Expand All @@ -233,7 +238,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::FindNeighbors",
"name": "nx::core::FindNeighbors",
"uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
},
"isDisabled": false
Expand All @@ -246,17 +251,20 @@
"axis_tolerance": 3.0,
"cell_parent_ids_array_name": "ParentIds",
"contiguous_neighbor_list_array_path": "DataContainer/CellFeatureData/NeighborList2",
"created_feature_attribute_matrix_name": "NewGrain Data",
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
"feature_ids_path": "DataContainer/CellData/FeatureIds",
"feature_parent_ids_array_name": "ParentIds",
"feature_phases_array_path": "DataContainer/CellFeatureData/Phases",
"created_feature_attribute_matrix_name": "NewGrain Data",
"non_contiguous_neighbor_list_array_path": "",
"use_non_contiguous_neighbors": false
"seed_array_name": "MergeTwins SeedValue",
"seed_value": 5489,
"use_non_contiguous_neighbors": false,
"use_seed": false
},
"comments": "",
"filter": {
"name": "simplnx::MergeTwinsFilter",
"name": "nx::core::MergeTwinsFilter",
"uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9"
},
"isDisabled": false
Expand All @@ -273,7 +281,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::CalculateFeatureSizesFilter",
"name": "nx::core::CalculateFeatureSizesFilter",
"uuid": "c666ee17-ca58-4969-80d0-819986c72485"
},
"isDisabled": false
Expand All @@ -290,11 +298,24 @@
},
"comments": "",
"filter": {
"name": "simplnx::RemoveMinimumSizeFeaturesFilter",
"name": "nx::core::RemoveMinimumSizeFeaturesFilter",
"uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0"
},
"isDisabled": false
},
{
"args": {
"removed_data_path": [
"DataContainer/CellFeatureData/NumNeighbors2"
]
},
"comments": "We are going to remove the DataContainer/CellFeatureData/NumNeighbors data because there is no way to ensure that it is correct after the last filter was executed.",
"filter": {
"name": "nx::core::DeleteData",
"uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606"
},
"isDisabled": false
},
{
"args": {
"boundary_cells_name": "BoundaryCells",
Expand All @@ -310,7 +331,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::FindNeighbors",
"name": "nx::core::FindNeighbors",
"uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
},
"isDisabled": false
Expand All @@ -329,24 +350,36 @@
},
"comments": "",
"filter": {
"name": "simplnx::MinNeighbors",
"name": "nx::core::MinNeighbors",
"uuid": "4ab5153f-6014-4e6d-bbd6-194068620389"
},
"isDisabled": false
},
{
"args": {
"removed_data_path": [
"DataContainer/CellFeatureData/NumNeighbors"
]
},
"comments": "We are going to remove the DataContainer/CellFeatureData/NumNeighbors data because there is no way to ensure that it is correct after the last filter was executed.",
"filter": {
"name": "nx::core::DeleteData",
"uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606"
},
"isDisabled": false
},
{
"args": {
"cell_phases_array_path": "Phases",
"feature_ids_path": "DataContainer/CellData/FeatureIds",
"ignored_data_array_paths": [],
"min_allowed_defect_size": 1000,
"selected_cell_data_group": "DataContainer/CellData",
"input_image_geometry_path": "DataContainer",
"min_allowed_defect_size": 1000,
"store_as_new_phase": false
},
"comments": "",
"filter": {
"name": "simplnx::FillBadDataFilter",
"name": "nx::core::FillBadDataFilter",
"uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e"
},
"isDisabled": false
Expand All @@ -355,17 +388,16 @@
"args": {
"feature_ids_path": "DataContainer/CellData/FeatureIds",
"ignored_data_array_paths": [],
"input_image_geometry_path": "DataContainer",
"num_iterations": 2,
"operation_index": 0,
"selected_feature_group_path": "DataContainer/CellFeatureData",
"input_image_geometry_path": "DataContainer",
"x_dir_on": true,
"y_dir_on": true,
"z_dir_on": true
},
"comments": "",
"filter": {
"name": "simplnx::ErodeDilateBadDataFilter",
"name": "nx::core::ErodeDilateBadDataFilter",
"uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b"
},
"isDisabled": false
Expand All @@ -374,17 +406,16 @@
"args": {
"feature_ids_path": "DataContainer/CellData/FeatureIds",
"ignored_data_array_paths": [],
"input_image_geometry_path": "DataContainer",
"num_iterations": 2,
"operation_index": 1,
"selected_feature_group_path": "DataContainer/CellFeatureData",
"input_image_geometry_path": "DataContainer",
"x_dir_on": true,
"y_dir_on": true,
"z_dir_on": true
},
"comments": "",
"filter": {
"name": "simplnx::ErodeDilateBadDataFilter",
"name": "nx::core::ErodeDilateBadDataFilter",
"uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b"
},
"isDisabled": false
Expand All @@ -405,7 +436,7 @@
},
"comments": "",
"filter": {
"name": "simplnx::GenerateIPFColorsFilter",
"name": "nx::core::GenerateIPFColorsFilter",
"uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6"
},
"isDisabled": false
Expand All @@ -417,11 +448,12 @@
},
"comments": "",
"filter": {
"name": "simplnx::WriteDREAM3DFilter",
"name": "nx::core::WriteDREAM3DFilter",
"uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003"
},
"isDisabled": false
}
],
"version": 1,
"workflowParams": []
}
1 change: 0 additions & 1 deletion src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ IFilter::PreflightResult CropImageGeometry::preflightImpl(const DataStructure& d
}
std::string warningMsg;
DataPath destCellFeatureAmPath = destImagePath.createChildPath(cellFeatureAmPath.getTargetName());
DataPath anyFeatureAMDataPath;
auto tDims = srcCellFeatureData->getShape();
resultOutputActions.value().appendAction(std::make_unique<CreateAttributeMatrixAction>(destCellFeatureAmPath, tDims));
for(const auto& [identifier, object] : *srcCellFeatureData)
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ IFilter::PreflightResult RemoveMinimumSizeFeaturesFilter::preflightImpl(const Da
std::vector<PreflightValue> preflightUpdatedValues;

// This section will warn the user about the removal of NeighborLists
auto result = nx::core::NeighborListRemovalPreflightCode(dataStructure, featureIdsPath, featurePhasesPath, resultOutputActions);
auto result = nx::core::NeighborListRemovalPreflightCode(dataStructure, featureIdsPath, numCellsPath, resultOutputActions);
if(result.outputActions.invalid())
{
return result;
Expand Down
5 changes: 3 additions & 2 deletions src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,9 @@ IFilter::PreflightResult ResampleImageGeomFilter::preflightImpl(const DataStruct
{
resultOutputActions.m_Warnings.push_back(Warning(
{-55503,
fmt::format("This filter will modify the Cell Level Array '{}' which causes all Feature level NeighborLists to become invalid. These NeighborLists will not be copied to the new geometry:{}",
featureIdsArrayPath.toString(), warningMsg)}));
fmt::format(
"This filter will modify the Cell Level Array '{}' which causes all Feature level NeighborLists to become invalid. These NeighborLists will not be copied to the new geometry:{}",
featureIdsArrayPath.toString(), warningMsg)}));
}
}

Expand Down

0 comments on commit 91a6501

Please sign in to comment.