Skip to content

Commit c3d72cb

Browse files
imikejacksonnyoungbq
imikejackson
and
nyoungbq
authored
BUG: Filters that delete NeighborLists from the DataStructure send strong warning messages. (#926)
Signed-off-by: Michael Jackson <[email protected]> Co-authored-by: Nathan Young <[email protected]>
1 parent d2b298f commit c3d72cb

32 files changed

+230
-129
lines changed

‎src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline

Lines changed: 70 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"comments": "",
3030
"filter": {
31-
"name": "simplnx::ReadH5EbsdFilter",
31+
"name": "nx::core::ReadH5EbsdFilter",
3232
"uuid": "db291b6c-9aaf-432d-9547-430c865a539c"
3333
},
3434
"isDisabled": false
@@ -58,11 +58,16 @@
5858
"type": "collection",
5959
"union": 0
6060
},
61-
"output_data_array_name": "Mask"
61+
"created_mask_type": 10,
62+
"custom_false_value": 0.0,
63+
"custom_true_value": 1.0,
64+
"output_data_array_name": "Mask",
65+
"use_custom_false_value": false,
66+
"use_custom_true_value": false
6267
},
6368
"comments": "",
6469
"filter": {
65-
"name": "simplnx::MultiThresholdObjects",
70+
"name": "nx::core::MultiThresholdObjects",
6671
"uuid": "4246245e-1011-4add-8436-0af6bed19228"
6772
},
6873
"isDisabled": false
@@ -76,7 +81,7 @@
7681
},
7782
"comments": "",
7883
"filter": {
79-
"name": "simplnx::ConvertOrientations",
84+
"name": "nx::core::ConvertOrientations",
8085
"uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b"
8186
},
8287
"isDisabled": false
@@ -86,46 +91,46 @@
8691
"alignment_shift_file_name": "Data/Output/Alignment_By_Misorientation_Shifts.txt",
8792
"cell_phases_array_path": "DataContainer/CellData/Phases",
8893
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
94+
"input_image_geometry_path": "DataContainer",
8995
"mask_array_path": "DataContainer/CellData/Mask",
9096
"misorientation_tolerance": 5.0,
9197
"quats_array_path": "DataContainer/CellData/Quats",
92-
"input_image_geometry_path": "DataContainer",
9398
"use_mask": true,
9499
"write_alignment_shifts": false
95100
},
96101
"comments": "",
97102
"filter": {
98-
"name": "simplnx::AlignSectionsMisorientationFilter",
103+
"name": "nx::core::AlignSectionsMisorientationFilter",
99104
"uuid": "8df2135c-7079-49f4-9756-4f3c028a5ced"
100105
},
101106
"isDisabled": false
102107
},
103108
{
104109
"args": {
105110
"fill_holes": false,
106-
"mask_array_path": "DataContainer/CellData/Mask",
107-
"input_image_geometry_path": "DataContainer"
111+
"input_image_geometry_path": "DataContainer",
112+
"mask_array_path": "DataContainer/CellData/Mask"
108113
},
109114
"comments": "",
110115
"filter": {
111-
"name": "simplnx::IdentifySample",
116+
"name": "nx::core::IdentifySample",
112117
"uuid": "94d47495-5a89-4c7f-a0ee-5ff20e6bd273"
113118
},
114119
"isDisabled": false
115120
},
116121
{
117122
"args": {
118123
"alignment_shift_file_name": "Data/Output/Alignment_By_Feature_Centroid_Shifts.txt",
124+
"input_image_geometry_path": "DataContainer",
119125
"mask_array_path": "DataContainer/CellData/Mask",
120126
"reference_slice": 0,
121127
"selected_cell_data_path": "DataContainer/CellData",
122-
"input_image_geometry_path": "DataContainer",
123128
"use_reference_slice": true,
124129
"write_alignment_shifts": false
125130
},
126131
"comments": "",
127132
"filter": {
128-
"name": "simplnx::AlignSectionsFeatureCentroidFilter",
133+
"name": "nx::core::AlignSectionsFeatureCentroidFilter",
129134
"uuid": "b83f9bae-9ccf-4932-96c3-7f2fdb091452"
130135
},
131136
"isDisabled": false
@@ -134,15 +139,15 @@
134139
"args": {
135140
"cell_phases_array_path": "DataContainer/CellData/Phases",
136141
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
137-
"mask_array_path": "DataContainer/CellData/Mask",
138142
"input_image_geometry_path": "DataContainer",
143+
"mask_array_path": "DataContainer/CellData/Mask",
139144
"misorientation_tolerance": 5.0,
140145
"number_of_neighbors": 4,
141146
"quats_array_path": "DataContainer/CellData/Quats"
142147
},
143148
"comments": "",
144149
"filter": {
145-
"name": "simplnx::BadDataNeighborOrientationCheckFilter",
150+
"name": "nx::core::BadDataNeighborOrientationCheckFilter",
146151
"uuid": "3f342977-aea1-49e1-a9c2-f73760eba0d3"
147152
},
148153
"isDisabled": false
@@ -161,7 +166,7 @@
161166
},
162167
"comments": "",
163168
"filter": {
164-
"name": "simplnx::NeighborOrientationCorrelationFilter",
169+
"name": "nx::core::NeighborOrientationCorrelationFilter",
165170
"uuid": "4625c192-7e46-4333-a294-67a2eb64cb37"
166171
},
167172
"isDisabled": false
@@ -170,19 +175,19 @@
170175
"args": {
171176
"active_array_name": "Active",
172177
"cell_feature_attribute_matrix_name": "CellFeatureData",
178+
"cell_mask_array_path": "DataContainer/CellData/Mask",
173179
"cell_phases_array_path": "DataContainer/CellData/Phases",
180+
"cell_quats_array_path": "DataContainer/CellData/Quats",
174181
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
175182
"feature_ids_array_name": "FeatureIds",
176-
"cell_mask_array_path": "DataContainer/CellData/Mask",
177183
"input_image_geometry_path": "DataContainer",
178184
"misorientation_tolerance": 5.0,
179-
"cell_quats_array_path": "DataContainer/CellData/Quats",
180185
"randomize_features": true,
181186
"use_mask": true
182187
},
183188
"comments": "",
184189
"filter": {
185-
"name": "simplnx::EBSDSegmentFeaturesFilter",
190+
"name": "nx::core::EBSDSegmentFeaturesFilter",
186191
"uuid": "1810c2c7-63e3-41db-b204-a5821e6271c0"
187192
},
188193
"isDisabled": false
@@ -196,7 +201,7 @@
196201
},
197202
"comments": "",
198203
"filter": {
199-
"name": "simplnx::FindFeaturePhasesFilter",
204+
"name": "nx::core::FindFeaturePhasesFilter",
200205
"uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc"
201206
},
202207
"isDisabled": false
@@ -213,7 +218,7 @@
213218
},
214219
"comments": "",
215220
"filter": {
216-
"name": "simplnx::FindAvgOrientationsFilter",
221+
"name": "nx::core::FindAvgOrientationsFilter",
217222
"uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e"
218223
},
219224
"isDisabled": false
@@ -233,7 +238,7 @@
233238
},
234239
"comments": "",
235240
"filter": {
236-
"name": "simplnx::FindNeighbors",
241+
"name": "nx::core::FindNeighbors",
237242
"uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
238243
},
239244
"isDisabled": false
@@ -246,17 +251,20 @@
246251
"axis_tolerance": 3.0,
247252
"cell_parent_ids_array_name": "ParentIds",
248253
"contiguous_neighbor_list_array_path": "DataContainer/CellFeatureData/NeighborList2",
254+
"created_feature_attribute_matrix_name": "NewGrain Data",
249255
"crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
250256
"feature_ids_path": "DataContainer/CellData/FeatureIds",
251257
"feature_parent_ids_array_name": "ParentIds",
252258
"feature_phases_array_path": "DataContainer/CellFeatureData/Phases",
253-
"created_feature_attribute_matrix_name": "NewGrain Data",
254259
"non_contiguous_neighbor_list_array_path": "",
255-
"use_non_contiguous_neighbors": false
260+
"seed_array_name": "MergeTwins SeedValue",
261+
"seed_value": 5489,
262+
"use_non_contiguous_neighbors": false,
263+
"use_seed": false
256264
},
257265
"comments": "",
258266
"filter": {
259-
"name": "simplnx::MergeTwinsFilter",
267+
"name": "nx::core::MergeTwinsFilter",
260268
"uuid": "f173786a-50cd-4c3c-9518-48ef6fc2bac9"
261269
},
262270
"isDisabled": false
@@ -273,7 +281,7 @@
273281
},
274282
"comments": "",
275283
"filter": {
276-
"name": "simplnx::CalculateFeatureSizesFilter",
284+
"name": "nx::core::CalculateFeatureSizesFilter",
277285
"uuid": "c666ee17-ca58-4969-80d0-819986c72485"
278286
},
279287
"isDisabled": false
@@ -290,11 +298,24 @@
290298
},
291299
"comments": "",
292300
"filter": {
293-
"name": "simplnx::RemoveMinimumSizeFeaturesFilter",
301+
"name": "nx::core::RemoveMinimumSizeFeaturesFilter",
294302
"uuid": "074472d3-ba8d-4a1a-99f2-2d56a0d082a0"
295303
},
296304
"isDisabled": false
297305
},
306+
{
307+
"args": {
308+
"removed_data_path": [
309+
"DataContainer/CellFeatureData/NumNeighbors2"
310+
]
311+
},
312+
"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.",
313+
"filter": {
314+
"name": "nx::core::DeleteData",
315+
"uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606"
316+
},
317+
"isDisabled": false
318+
},
298319
{
299320
"args": {
300321
"boundary_cells_name": "BoundaryCells",
@@ -310,7 +331,7 @@
310331
},
311332
"comments": "",
312333
"filter": {
313-
"name": "simplnx::FindNeighbors",
334+
"name": "nx::core::FindNeighbors",
314335
"uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598"
315336
},
316337
"isDisabled": false
@@ -329,24 +350,36 @@
329350
},
330351
"comments": "",
331352
"filter": {
332-
"name": "simplnx::MinNeighbors",
353+
"name": "nx::core::MinNeighbors",
333354
"uuid": "4ab5153f-6014-4e6d-bbd6-194068620389"
334355
},
335356
"isDisabled": false
336357
},
358+
{
359+
"args": {
360+
"removed_data_path": [
361+
"DataContainer/CellFeatureData/NumNeighbors"
362+
]
363+
},
364+
"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.",
365+
"filter": {
366+
"name": "nx::core::DeleteData",
367+
"uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606"
368+
},
369+
"isDisabled": false
370+
},
337371
{
338372
"args": {
339373
"cell_phases_array_path": "Phases",
340374
"feature_ids_path": "DataContainer/CellData/FeatureIds",
341375
"ignored_data_array_paths": [],
342-
"min_allowed_defect_size": 1000,
343-
"selected_cell_data_group": "DataContainer/CellData",
344376
"input_image_geometry_path": "DataContainer",
377+
"min_allowed_defect_size": 1000,
345378
"store_as_new_phase": false
346379
},
347380
"comments": "",
348381
"filter": {
349-
"name": "simplnx::FillBadDataFilter",
382+
"name": "nx::core::FillBadDataFilter",
350383
"uuid": "a59eb864-9e6b-40bb-9292-e5281b0b4f3e"
351384
},
352385
"isDisabled": false
@@ -355,17 +388,16 @@
355388
"args": {
356389
"feature_ids_path": "DataContainer/CellData/FeatureIds",
357390
"ignored_data_array_paths": [],
391+
"input_image_geometry_path": "DataContainer",
358392
"num_iterations": 2,
359393
"operation_index": 0,
360-
"selected_feature_group_path": "DataContainer/CellFeatureData",
361-
"input_image_geometry_path": "DataContainer",
362394
"x_dir_on": true,
363395
"y_dir_on": true,
364396
"z_dir_on": true
365397
},
366398
"comments": "",
367399
"filter": {
368-
"name": "simplnx::ErodeDilateBadDataFilter",
400+
"name": "nx::core::ErodeDilateBadDataFilter",
369401
"uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b"
370402
},
371403
"isDisabled": false
@@ -374,17 +406,16 @@
374406
"args": {
375407
"feature_ids_path": "DataContainer/CellData/FeatureIds",
376408
"ignored_data_array_paths": [],
409+
"input_image_geometry_path": "DataContainer",
377410
"num_iterations": 2,
378411
"operation_index": 1,
379-
"selected_feature_group_path": "DataContainer/CellFeatureData",
380-
"input_image_geometry_path": "DataContainer",
381412
"x_dir_on": true,
382413
"y_dir_on": true,
383414
"z_dir_on": true
384415
},
385416
"comments": "",
386417
"filter": {
387-
"name": "simplnx::ErodeDilateBadDataFilter",
418+
"name": "nx::core::ErodeDilateBadDataFilter",
388419
"uuid": "7f2f7378-580e-4337-8c04-a29e7883db0b"
389420
},
390421
"isDisabled": false
@@ -405,7 +436,7 @@
405436
},
406437
"comments": "",
407438
"filter": {
408-
"name": "simplnx::GenerateIPFColorsFilter",
439+
"name": "nx::core::GenerateIPFColorsFilter",
409440
"uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6"
410441
},
411442
"isDisabled": false
@@ -417,11 +448,12 @@
417448
},
418449
"comments": "",
419450
"filter": {
420-
"name": "simplnx::WriteDREAM3DFilter",
451+
"name": "nx::core::WriteDREAM3DFilter",
421452
"uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003"
422453
},
423454
"isDisabled": false
424455
}
425456
],
457+
"version": 1,
426458
"workflowParams": []
427459
}

‎src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"DataContainer/CellFeatureData/Phases",
2727
"DataContainer/CellFeatureData/AvgQuats",
2828
"DataContainer/CellFeatureData/AvgEulerAngles",
29-
"DataContainer/CellFeatureData/NumNeighbors2",
29+
3030
"DataContainer/NewGrain Data",
3131
"DataContainer/CellData/ParentIds",
3232
"DataContainer/CellFeatureData/ParentIds",

‎src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"DataContainer/CellFeatureData/Active",
2525
"DataContainer/CellData/FeatureIds",
2626
"DataContainer/CellFeatureData/Phases",
27-
"DataContainer/CellFeatureData/NumNeighbors2",
27+
2828
"DataContainer/NewGrain Data",
2929
"DataContainer/CellData/ParentIds",
3030
"DataContainer/CellFeatureData/ParentIds",
@@ -77,7 +77,7 @@
7777
"DataContainer/CellFeatureData/Phases",
7878
"DataContainer/CellFeatureData/AvgQuats",
7979
"DataContainer/CellFeatureData/AvgEulerAngles",
80-
"DataContainer/CellFeatureData/NumNeighbors2",
80+
8181
"DataContainer/NewGrain Data",
8282
"DataContainer/CellData/ParentIds",
8383
"DataContainer/CellFeatureData/ParentIds",

‎src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"DataContainer/CellFeatureData/Active",
2525
"DataContainer/CellData/FeatureIds",
2626
"DataContainer/CellFeatureData/Phases",
27-
"DataContainer/CellFeatureData/NumNeighbors2",
27+
2828
"DataContainer/NewGrain Data",
2929
"DataContainer/CellData/ParentIds",
3030
"DataContainer/CellFeatureData/ParentIds",

‎src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"DataContainer/CellFeatureData",
2929
"DataContainer/CellFeatureData/Active",
3030
"DataContainer/CellFeatureData/Phases",
31-
"DataContainer/CellFeatureData/NumNeighbors2",
31+
3232
"DataContainer/CellFeatureData/ParentIds",
3333
"DataContainer/CellFeatureData/Centroids",
3434
"DataContainer/CellFeatureData/EquivalentDiameters",

‎src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"DataContainer/CellFeatureData/Neighborhoods",
4444
"DataContainer/CellFeatureData/NumElements",
4545
"DataContainer/CellFeatureData/NumNeighbors",
46-
"DataContainer/CellFeatureData/NumNeighbors2",
46+
4747
"DataContainer/CellFeatureData/Omega3s",
4848
"DataContainer/CellFeatureData/ParentIds",
4949
"DataContainer/CellFeatureData/Phases",

0 commit comments

Comments
 (0)