X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkGenericMetric.txx;h=d4a19c26d5f15a733e4838b3b6cfa1f110e78d72;hb=e751b47051ae80ecd388418ae39b388f15e627eb;hp=58e681aeda3d6f2110d6bd1c86fb0e28b62146b0;hpb=6673fd0ae6026140ca07b3491c093b9600cc91a6;p=clitk.git

diff --git a/registration/clitkGenericMetric.txx b/registration/clitkGenericMetric.txx
index 58e681a..d4a19c2 100644
--- a/registration/clitkGenericMetric.txx
+++ b/registration/clitkGenericMetric.txx
@@ -31,15 +31,13 @@ namespace clitk
 template <class args_info_type, class FixedImageType, class MovingImageType>
 GenericMetric<args_info_type, FixedImageType, MovingImageType>::GenericMetric()
 {
-  m_Metric=NULL;
+  m_Metric=ITK_NULLPTR;
   m_Maximize=false;
   m_Verbose=false;
   m_FixedImageRegionGiven=false;
-#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
   m_FixedImageSamplesIntensityThreshold=0;
   m_UseFixedImageSamplesIntensityThreshold=false;
-#endif
-  m_FixedImageMask=NULL;
+  m_FixedImageMask=ITK_NULLPTR;
 }
 
 
@@ -257,7 +255,7 @@ GenericMetric<args_info_type,FixedImageType, MovingImageType>::GetMetricPointer(
 
 
   typedef itk::ImageMaskSpatialObject<itkGetStaticConstMacro(FixedImageDimension)> ImageMaskSpatialObjectType;
-  typename ImageMaskSpatialObjectType::ConstPointer mask = NULL;
+  typename ImageMaskSpatialObjectType::ConstPointer mask = ITK_NULLPTR;
   if (m_FixedImageMask.IsNotNull())
     mask = dynamic_cast<const ImageMaskSpatialObjectType*>(m_FixedImageMask.GetPointer());
 
@@ -273,9 +271,6 @@ GenericMetric<args_info_type,FixedImageType, MovingImageType>::GetMetricPointer(
   m_Metric->SetFixedImageRegion(m_FixedImageRegion);
   //m_Metric->SetFixedImageRegion(mask_region);
 
-
-#ifdef ITK_USE_OPTIMIZED_REGISTRATION_METHODS
-
   //============================================================================
   // Set the lower intensity threshold
   if (m_ArgsInfo.intThreshold_given) {
@@ -402,13 +397,13 @@ GenericMetric<args_info_type,FixedImageType, MovingImageType>::GetMetricPointer(
           }
 
           // Intensity?
-          if( m_UseFixedImageSamplesIntensityThreshold &&
-              randIter.Get() < m_FixedImageSamplesIntensityThreshold ) {
-            ++randIter;
-              //if (m_Verbose) std::cout << "not in threshold" << std::endl;
-              count_not_thres++;
-            continue;
-          }
+//           if( m_UseFixedImageSamplesIntensityThreshold &&
+//               randIter.Get() < m_FixedImageSamplesIntensityThreshold ) {
+//             ++randIter;
+//               //if (m_Verbose) std::cout << "not in threshold" << std::endl;
+//               count_not_thres++;
+//             continue;
+//           }
 
           // Add point to the numbers
           fiic.push_back(index);
@@ -436,12 +431,6 @@ GenericMetric<args_info_type,FixedImageType, MovingImageType>::GetMetricPointer(
     if (m_Verbose) std::cout<<"number of mask pixels "<<totalNumberOfMaskPixels<<std::endl;
 
   }
-
-#else
-  if (m_Verbose) std::cout<<"Not setting the fixed image intensity threshold or the fraction of samples to use (not compiled with USE_OPTIMIZED_REGISTRATION_METHODS)..."<<std::endl;
-
-
-#endif
   //============================================================================
   //return the pointer
   return m_Metric;