STYLE: Make threading related data of metrics private

Applies to both `PCAMetric` and `ParzenWindowHistogramImageToImageMetric`. Follow-up to pull request #643 commit ab0c8df "STYLE: Make data ImageMomentsCalculator, ComputeDisplacementDist private"
SuperElastix · May 6, 2022 · ed8b3b7 · ed8b3b7
1 parent 398cea9
commit ed8b3b7
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 51 deletions.
diff --git a/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h b/Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h
@@ -294,33 +294,6 @@ class ITK_TEMPLATE_EXPORT ParzenWindowHistogramImageToImageMetric
   KernelFunctionPointer m_MovingKernel;
   KernelFunctionPointer m_DerivativeMovingKernel;
 
-  /** Threading related parameters. */
-  mutable std::vector<JointPDFPointer> m_ThreaderJointPDFs;
-
-  /** Helper structs that multi-threads the computation of
-   * the metric derivative using ITK threads.
-   */
-  struct ParzenWindowHistogramMultiThreaderParameterType // can't we use the one from AdvancedImageToImageMetric ?
-  {
-    Self * m_Metric;
-  };
-  ParzenWindowHistogramMultiThreaderParameterType m_ParzenWindowHistogramThreaderParameters;
-
-  struct ParzenWindowHistogramGetValueAndDerivativePerThreadStruct
-  {
-    SizeValueType   st_NumberOfPixelsCounted;
-    JointPDFPointer st_JointPDF;
-  };
-  itkPadStruct(ITK_CACHE_LINE_ALIGNMENT,
-               ParzenWindowHistogramGetValueAndDerivativePerThreadStruct,
-               PaddedParzenWindowHistogramGetValueAndDerivativePerThreadStruct);
-  itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT,
-                    PaddedParzenWindowHistogramGetValueAndDerivativePerThreadStruct,
-                    AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct);
-  mutable AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct *
-                       m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables;
-  mutable ThreadIdType m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariablesSize;
-
   /** Initialize threading related parameters. */
   void
   InitializeThreadingParameters() const override;
@@ -505,6 +478,33 @@ class ITK_TEMPLATE_EXPORT ParzenWindowHistogramImageToImageMetric
   void
   operator=(const Self &) = delete;
 
+  /** Threading related parameters. */
+  mutable std::vector<JointPDFPointer> m_ThreaderJointPDFs;
+
+  /** Helper structs that multi-threads the computation of
+   * the metric derivative using ITK threads.
+   */
+  struct ParzenWindowHistogramMultiThreaderParameterType // can't we use the one from AdvancedImageToImageMetric ?
+  {
+    Self * m_Metric;
+  };
+  ParzenWindowHistogramMultiThreaderParameterType m_ParzenWindowHistogramThreaderParameters;
+
+  struct ParzenWindowHistogramGetValueAndDerivativePerThreadStruct
+  {
+    SizeValueType   st_NumberOfPixelsCounted;
+    JointPDFPointer st_JointPDF;
+  };
+  itkPadStruct(ITK_CACHE_LINE_ALIGNMENT,
+               ParzenWindowHistogramGetValueAndDerivativePerThreadStruct,
+               PaddedParzenWindowHistogramGetValueAndDerivativePerThreadStruct);
+  itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT,
+                    PaddedParzenWindowHistogramGetValueAndDerivativePerThreadStruct,
+                    AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct);
+  mutable AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct *
+                       m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables;
+  mutable ThreadIdType m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariablesSize;
+
   /** Variables that can/should be accessed by their Set/Get functions. */
   unsigned long m_NumberOfFixedHistogramBins;
   unsigned long m_NumberOfMovingHistogramBins;

diff --git a/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h b/Components/Metrics/PCAMetric/itkPCAMetric_F_multithreaded.h
@@ -163,30 +163,6 @@ class ITK_TEMPLATE_EXPORT PCAMetric : public AdvancedImageToImageMetric<TFixedIm
                                         const MovingImageDerivativeType & movingImageDerivative,
                                         DerivativeType &                  imageJacobian) const override;
 
-  struct PCAMetricMultiThreaderParameterType
-  {
-    Self * m_Metric;
-  };
-
-  PCAMetricMultiThreaderParameterType m_PCAMetricThreaderParameters;
-
-  struct PCAMetricGetSamplesPerThreadStruct
-  {
-    SizeValueType                    st_NumberOfPixelsCounted;
-    MatrixType                       st_DataBlock;
-    std::vector<FixedImagePointType> st_ApprovedSamples;
-    DerivativeType                   st_Derivative;
-  };
-
-  itkPadStruct(ITK_CACHE_LINE_ALIGNMENT, PCAMetricGetSamplesPerThreadStruct, PaddedPCAMetricGetSamplesPerThreadStruct);
-
-  itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT,
-                    PaddedPCAMetricGetSamplesPerThreadStruct,
-                    AlignedPCAMetricGetSamplesPerThreadStruct);
-
-  mutable AlignedPCAMetricGetSamplesPerThreadStruct * m_PCAMetricGetSamplesPerThreadVariables;
-  mutable ThreadIdType                                m_PCAMetricGetSamplesPerThreadVariablesSize;
-
   /** Get value and derivatives for each thread. */
   inline void
   ThreadedGetSamples(ThreadIdType threadID);
@@ -224,6 +200,30 @@ class ITK_TEMPLATE_EXPORT PCAMetric : public AdvancedImageToImageMetric<TFixedIm
   void
   operator=(const Self &) = delete;
 
+  struct PCAMetricMultiThreaderParameterType
+  {
+    Self * m_Metric;
+  };
+
+  PCAMetricMultiThreaderParameterType m_PCAMetricThreaderParameters;
+
+  struct PCAMetricGetSamplesPerThreadStruct
+  {
+    SizeValueType                    st_NumberOfPixelsCounted;
+    MatrixType                       st_DataBlock;
+    std::vector<FixedImagePointType> st_ApprovedSamples;
+    DerivativeType                   st_Derivative;
+  };
+
+  itkPadStruct(ITK_CACHE_LINE_ALIGNMENT, PCAMetricGetSamplesPerThreadStruct, PaddedPCAMetricGetSamplesPerThreadStruct);
+
+  itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT,
+                    PaddedPCAMetricGetSamplesPerThreadStruct,
+                    AlignedPCAMetricGetSamplesPerThreadStruct);
+
+  mutable AlignedPCAMetricGetSamplesPerThreadStruct * m_PCAMetricGetSamplesPerThreadVariables;
+  mutable ThreadIdType                                m_PCAMetricGetSamplesPerThreadVariablesSize;
+
   unsigned int m_G;
   unsigned int m_LastDimIndex;