STYLE: Remove UseMask property from ComputeImageExtremaFilter

Assumed that ComputeImageExtremaFilter should use its mask, if and only if the mask is not null.
SuperElastix · Feb 19, 2024 · e99644c · e99644c
1 parent 97fe5bb
commit e99644c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 37 deletions.
diff --git a/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx b/Common/CostFunctions/itkAdvancedImageToImageMetric.hxx
@@ -192,12 +192,7 @@ AdvancedImageToImageMetric<TFixedImage, TMovingImage>::InitializeLimiters()
 
     const auto computeFixedImageExtrema = ComputeImageExtremaFilter<FixedImageType>::New();
     computeFixedImageExtrema->SetInput(this->GetFixedImage());
-    if (const auto * const fMask = this->GetFixedImageMask())
-    {
-      computeFixedImageExtrema->SetUseMask(true);
-      computeFixedImageExtrema->SetImageSpatialMask(fMask);
-    }
-
+    computeFixedImageExtrema->SetImageSpatialMask(this->GetFixedImageMask());
     computeFixedImageExtrema->Update();
 
     this->m_FixedImageTrueMax = computeFixedImageExtrema->GetMaximum();
@@ -228,11 +223,7 @@ AdvancedImageToImageMetric<TFixedImage, TMovingImage>::InitializeLimiters()
 
     const auto computeMovingImageExtrema = ComputeImageExtremaFilter<MovingImageType>::New();
     computeMovingImageExtrema->SetInput(this->GetMovingImage());
-    if (const auto * const mask = this->GetMovingImageMask())
-    {
-      computeMovingImageExtrema->SetUseMask(true);
-      computeMovingImageExtrema->SetImageSpatialMask(mask);
-    }
+    computeMovingImageExtrema->SetImageSpatialMask(this->GetMovingImageMask());
     computeMovingImageExtrema->Update();
 
     this->m_MovingImageTrueMax = computeMovingImageExtrema->GetMaximum();

diff --git a/Common/GTesting/itkComputeImageExtremaFilterGTest.cxx b/Common/GTesting/itkComputeImageExtremaFilterGTest.cxx
@@ -196,7 +196,6 @@ Expect_one_non_zero_pixel_value_masked_in(const typename TImage::SizeType & imag
     const auto filter = CheckNew<FilterType>();
     filter->SetInput(image);
     filter->SetImageSpatialMask(maskSpatialObject);
-    filter->SetUseMask(true);
     filter->Update();
 
     EXPECT_EQ(filter->GetMinimum(), pixelValue);
@@ -247,7 +246,6 @@ Expect_one_positive_pixel_value_all_pixels_masked_in(const typename TImage::Size
     const auto filter = CheckNew<FilterType>();
     filter->SetInput(image);
     filter->SetImageSpatialMask(maskSpatialObject);
-    filter->SetUseMask(true);
     filter->Update();
 
     EXPECT_EQ(filter->GetMinimum(), 0);
@@ -356,8 +354,6 @@ GTEST_TEST(ComputeImageExtremaFilter, MaskSpacingAndDirectionAffectResults)
     elastix::DefaultConstruct<FilterType> filter{};
     filter.SetInput(image);
     filter.SetImageSpatialMask(maskSpatialObject);
-    filter.SetUseMask(true);
-
     filter.Update();
     return filter.GetMaximum();
   };

diff --git a/Common/itkComputeImageExtremaFilter.h b/Common/itkComputeImageExtremaFilter.h
@@ -76,8 +76,6 @@ class ITK_TEMPLATE_EXPORT ComputeImageExtremaFilter : public StatisticsImageFilt
   /** Type to use for computations. */
   using typename Superclass::RealType;
 
-  itkSetMacro(UseMask, bool);
-
   using ImageSpatialMaskType = ImageMaskSpatialObject<Self::ImageDimension>;
   using ImageSpatialMaskPointer = typename ImageSpatialMaskType::Pointer;
   using ImageSpatialMaskConstPointer = typename ImageSpatialMaskType::ConstPointer;
@@ -105,7 +103,6 @@ class ITK_TEMPLATE_EXPORT ComputeImageExtremaFilter : public StatisticsImageFilt
 
 private:
   ImageSpatialMaskConstPointer m_ImageSpatialMask{};
-  bool                         m_UseMask{ false };
   bool                         m_SameGeometry{ false };
 
   CompensatedSummation<RealType> m_ThreadSum{ 1 };

diff --git a/Common/itkComputeImageExtremaFilter.hxx b/Common/itkComputeImageExtremaFilter.hxx
@@ -29,7 +29,7 @@ template <typename TInputImage>
 void
 ComputeImageExtremaFilter<TInputImage>::BeforeStreamedGenerateData()
 {
-  if (!this->m_UseMask)
+  if (m_ImageSpatialMask == nullptr)
   {
     Superclass::BeforeStreamedGenerateData();
   }
@@ -57,7 +57,7 @@ template <typename TInputImage>
 void
 ComputeImageExtremaFilter<TInputImage>::AfterStreamedGenerateData()
 {
-  if (!this->m_UseMask)
+  if (m_ImageSpatialMask == nullptr)
   {
     Superclass::AfterStreamedGenerateData();
   }
@@ -89,16 +89,13 @@ template <typename TInputImage>
 void
 ComputeImageExtremaFilter<TInputImage>::ThreadedStreamedGenerateData(const RegionType & regionForThread)
 {
-  if (!this->m_UseMask)
+  if (m_ImageSpatialMask == nullptr)
   {
     Superclass::ThreadedStreamedGenerateData(regionForThread);
   }
   else
   {
-    if (this->GetImageSpatialMask())
-    {
-      this->ThreadedGenerateDataImageSpatialMask(regionForThread);
-    }
+    this->ThreadedGenerateDataImageSpatialMask(regionForThread);
   }
 } // end ThreadedGenerateData()
 

diff --git a/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.hxx b/Components/Metrics/AdvancedMeanSquares/itkAdvancedMeanSquaresImageToImageMetric.hxx
@@ -56,12 +56,7 @@ AdvancedMeanSquaresImageToImageMetric<TFixedImage, TMovingImage>::Initialize()
     /** Try to guess a normalization factor. */
     const auto computeFixedImageExtrema = ComputeImageExtremaFilter<FixedImageType>::New();
     computeFixedImageExtrema->SetInput(this->GetFixedImage());
-    if (const auto * const mask = this->GetFixedImageMask())
-    {
-      computeFixedImageExtrema->SetUseMask(true);
-      computeFixedImageExtrema->SetImageSpatialMask(mask);
-    }
-
+    computeFixedImageExtrema->SetImageSpatialMask(this->GetFixedImageMask());
     computeFixedImageExtrema->Update();
 
     this->m_FixedImageTrueMax = computeFixedImageExtrema->GetMaximum();
@@ -76,12 +71,7 @@ AdvancedMeanSquaresImageToImageMetric<TFixedImage, TMovingImage>::Initialize()
 
     const auto computeMovingImageExtrema = ComputeImageExtremaFilter<MovingImageType>::New();
     computeMovingImageExtrema->SetInput(this->GetMovingImage());
-    if (const auto * const mask = this->GetMovingImageMask())
-    {
-      computeMovingImageExtrema->SetUseMask(true);
-      computeMovingImageExtrema->SetImageSpatialMask(mask);
-    }
-
+    computeMovingImageExtrema->SetImageSpatialMask(this->GetMovingImageMask());
     computeMovingImageExtrema->Update();
 
     this->m_MovingImageTrueMax = computeMovingImageExtrema->GetMaximum();