Clean up more filter arguments and pipeline files

Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Oct 20, 2023 · 5a0d8bb · 5a0d8bb
1 parent 3e8e344
commit 5a0d8bb
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline
@@ -192,7 +192,7 @@
     },
     {
       "args": {
-        "confidence_index_array_path": "DataContainer/Cell Data/Confidence Index",
+        "comparison_data_path": "DataContainer/Cell Data/Confidence Index",
         "loop": true,
         "min_confidence": 0.10000000149011612,
         "selected_comparison": 0,

diff --git a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline
@@ -192,7 +192,7 @@
             {
               "args": {
                 "cell_phases_array_path": "DataContainer/CellData/Phases",
-                "confidence_index_array_path": "DataContainer/CellData/Confidence Index",
+                "correlation_array_path": "DataContainer/CellData/Confidence Index",
                 "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
                 "ignored_data_array_paths": [],
                 "image_geometry_path": "DataContainer",

diff --git a/...onAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/...onAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline
@@ -150,7 +150,7 @@
     {
       "args": {
         "cell_phases_array_path": "DataContainer/CellData/Phases",
-        "confidence_index_array_path": "DataContainer/CellData/Confidence Index",
+        "correlation_array_path": "DataContainer/CellData/Confidence Index",
         "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
         "ignored_data_array_paths": [],
         "image_geometry_path": "DataContainer",

diff --git a/...alysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/...alysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline
@@ -237,7 +237,7 @@
                     {
                       "args": {
                         "cell_phases_array_path": "DataContainer/CellData/Phases",
-                        "confidence_index_array_path": "DataContainer/CellData/Confidence Index",
+                        "correlation_array_path": "DataContainer/CellData/Confidence Index",
                         "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
                         "ignored_data_array_paths": [],
                         "image_geometry_path": "DataContainer",

diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline
@@ -493,7 +493,7 @@
                                                     {
                                                       "args": {
                                                         "cell_phases_array_path": "DataContainer/CellData/Phases",
-                                                        "confidence_index_array_path": "DataContainer/CellData/Confidence Index",
+                                                        "correlation_array_path": "DataContainer/CellData/Confidence Index",
                                                         "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures",
                                                         "ignored_data_array_paths": [],
                                                         "image_geometry_path": "DataContainer",

diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline
@@ -39,7 +39,7 @@
     },
     {
       "args": {
-        "cell_euler_angles_array_path": "ImageGeom/Cell Data/EulerAngles",
+        "euler_angles_array_path": "ImageGeom/Cell Data/EulerAngles",
         "rotation_axis": [
           0.0,
           0.0,

diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline
@@ -108,7 +108,7 @@
     },
     {
       "args": {
-        "confidence_index_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Error",
+        "comparison_data_path": "fw-ar-IF1-aptr12-corr/Cell Data/Error",
         "loop": true,
         "min_confidence": 0.0,
         "selected_comparison": 0,

diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline
@@ -108,7 +108,7 @@
     },
     {
       "args": {
-        "confidence_index_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Error",
+        "comparison_data_path": "fw-ar-IF1-avtr12-corr/Cell Data/Error",
         "loop": true,
         "min_confidence": 0.0,
         "selected_comparison": 0,

diff --git a/...entationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp b/...entationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp
@@ -64,7 +64,7 @@ Parameters NeighborOrientationCorrelationFilter::parameters() const
   params.insertSeparator(Parameters::Separator{"Cell Data"});
   params.insert(std::make_unique<GeometrySelectionParameter>(k_ImageGeometryPath_Key, "Image Geometry", "Path to the target geometry", DataPath{},
                                                              GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image}));
-  params.insert(std::make_unique<ArraySelectionParameter>(k_ConfidenceIndexArrayPath_Key, "Confidence Index", "Specifies the confidence in the orientation of the Cell (TSL data)", DataPath{},
+  params.insert(std::make_unique<ArraySelectionParameter>(k_CorrelationArrayPath_Key, "Confidence Index", "Specifies the confidence in the orientation of the Cell (TSL data)", DataPath{},
                                                           ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}}));
   params.insert(std::make_unique<ArraySelectionParameter>(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath({"Phases"}),
                                                           ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}}));
@@ -94,7 +94,7 @@ IFilter::PreflightResult NeighborOrientationCorrelationFilter::preflightImpl(con
   auto pMinConfidenceValue = filterArgs.value<float32>(k_MinConfidence_Key);
   auto pMisorientationToleranceValue = filterArgs.value<float32>(k_MisorientationTolerance_Key);
   auto pLevelValue = filterArgs.value<int32>(k_Level_Key);
-  auto pConfidenceIndexArrayPathValue = filterArgs.value<DataPath>(k_ConfidenceIndexArrayPath_Key);
+  auto pConfidenceIndexArrayPathValue = filterArgs.value<DataPath>(k_CorrelationArrayPath_Key);
   auto pCellPhasesArrayPathValue = filterArgs.value<DataPath>(k_CellPhasesArrayPath_Key);
   auto pQuatsArrayPathValue = filterArgs.value<DataPath>(k_QuatsArrayPath_Key);
   auto pCrystalStructuresArrayPathValue = filterArgs.value<DataPath>(k_CrystalStructuresArrayPath_Key);
@@ -237,7 +237,7 @@ Result<> NeighborOrientationCorrelationFilter::executeImpl(DataStructure& dataSt
   inputValues.MinConfidence = filterArgs.value<float32>(k_MinConfidence_Key);
   inputValues.MisorientationTolerance = filterArgs.value<float32>(k_MisorientationTolerance_Key);
   inputValues.Level = filterArgs.value<int32>(k_Level_Key);
-  inputValues.ConfidenceIndexArrayPath = filterArgs.value<DataPath>(k_ConfidenceIndexArrayPath_Key);
+  inputValues.ConfidenceIndexArrayPath = filterArgs.value<DataPath>(k_CorrelationArrayPath_Key);
   inputValues.CellPhasesArrayPath = filterArgs.value<DataPath>(k_CellPhasesArrayPath_Key);
   inputValues.QuatsArrayPath = filterArgs.value<DataPath>(k_QuatsArrayPath_Key);
   inputValues.CrystalStructuresArrayPath = filterArgs.value<DataPath>(k_CrystalStructuresArrayPath_Key);

diff --git a/...entationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp b/...entationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp
@@ -28,7 +28,7 @@ class ORIENTATIONANALYSIS_EXPORT NeighborOrientationCorrelationFilter : public I
   static inline constexpr StringLiteral k_MinConfidence_Key = "min_confidence";
   static inline constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance";
   static inline constexpr StringLiteral k_Level_Key = "level";
-  static inline constexpr StringLiteral k_ConfidenceIndexArrayPath_Key = "confidence_index_array_path";
+  static inline constexpr StringLiteral k_CorrelationArrayPath_Key = "correlation_array_path";
   static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path";
   static inline constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path";
   static inline constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path";

diff --git a/src/Plugins/OrientationAnalysis/test/NeighborOrientationCorrelationTest.cpp b/src/Plugins/OrientationAnalysis/test/NeighborOrientationCorrelationTest.cpp
@@ -83,7 +83,7 @@ TEST_CASE("OrientationAnalysis::NeighborOrientationCorrelationFilter: Small IN10
     args.insertOrAssign(NeighborOrientationCorrelationFilter::k_MinConfidence_Key, std::make_any<float32>(0.2f));
     args.insertOrAssign(NeighborOrientationCorrelationFilter::k_MisorientationTolerance_Key, std::make_any<float32>(5.0f));
     args.insertOrAssign(NeighborOrientationCorrelationFilter::k_Level_Key, std::make_any<int32>(2));
-    args.insertOrAssign(NeighborOrientationCorrelationFilter::k_ConfidenceIndexArrayPath_Key, std::make_any<DataPath>(k_ConfidenceIndexArrayPath));
+    args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CorrelationArrayPath_Key, std::make_any<DataPath>(k_ConfidenceIndexArrayPath));
     args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CellPhasesArrayPath_Key, std::make_any<DataPath>(k_PhasesArrayPath));
     args.insertOrAssign(NeighborOrientationCorrelationFilter::k_QuatsArrayPath_Key, std::make_any<DataPath>(k_QuatsArrayPath));
     args.insertOrAssign(NeighborOrientationCorrelationFilter::k_CrystalStructuresArrayPath_Key, std::make_any<DataPath>(k_CrystalStructuresArrayPath));

diff --git a/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp b/src/Plugins/OrientationAnalysis/test/OrientationAnalysisTestUtils.hpp
@@ -301,7 +301,7 @@ inline void ExecuteNeighborOrientationCorrelation(DataStructure& dataStructure,
   constexpr StringLiteral k_MinConfidence_Key = "min_confidence";
   constexpr StringLiteral k_MisorientationTolerance_Key = "misorientation_tolerance";
   constexpr StringLiteral k_Level_Key = "level";
-  constexpr StringLiteral k_ConfidenceIndexArrayPath_Key = "confidence_index_array_path";
+  constexpr StringLiteral k_CorrelationArrayPath_Key = "correlation_array_path";
   constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path";
   constexpr StringLiteral k_QuatsArrayPath_Key = "quats_array_path";
   constexpr StringLiteral k_CrystalStructuresArrayPath_Key = "crystal_structures_array_path";
@@ -313,7 +313,7 @@ inline void ExecuteNeighborOrientationCorrelation(DataStructure& dataStructure,
   args.insertOrAssign(k_MinConfidence_Key, std::make_any<float32>(0.2f));
   args.insertOrAssign(k_MisorientationTolerance_Key, std::make_any<float32>(5.0f));
   args.insertOrAssign(k_Level_Key, std::make_any<int32>(2));
-  args.insertOrAssign(k_ConfidenceIndexArrayPath_Key, std::make_any<DataPath>(Constants::k_ConfidenceIndexArrayPath));
+  args.insertOrAssign(k_CorrelationArrayPath_Key, std::make_any<DataPath>(Constants::k_ConfidenceIndexArrayPath));
   args.insertOrAssign(k_CellPhasesArrayPath_Key, std::make_any<DataPath>(Constants::k_PhasesArrayPath));
   args.insertOrAssign(k_QuatsArrayPath_Key, std::make_any<DataPath>(Constants::k_QuatsArrayPath));
   args.insertOrAssign(k_CrystalStructuresArrayPath_Key, std::make_any<DataPath>(Constants::k_CrystalStructuresArrayPath));