X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkGenericMetric.txx;h=6f10e72a1ee1e04744927727c70dbfe31b800056;hb=refs%2Ftags%2Fv1.2.0;hp=41e519cf0a6fda471cddb0ce18f2dd919c7921ea;hpb=21c3eb5adf66f43be7443ac026a8de1d02d8d31a;p=clitk.git

diff --git a/registration/clitkGenericMetric.txx b/registration/clitkGenericMetric.txx
index 41e519c..6f10e72 100644
--- a/registration/clitkGenericMetric.txx
+++ b/registration/clitkGenericMetric.txx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 
 #ifndef __clitkGenericMetric_txx
 #define __clitkGenericMetric_txx
@@ -256,16 +256,16 @@ GenericMetric<args_info_type,FixedImageType, MovingImageType>::GetMetricPointer(
   }
 
 
-  typedef itk::ImageMaskSpatialObject<itkGetStaticConstMacro(FixedImageDimension)> ImageMaskSpatialObjectType;
-  typename ImageMaskSpatialObjectType::ConstPointer mask = dynamic_cast<const ImageMaskSpatialObjectType*>(m_FixedImageMask.GetPointer());
-  
-  typedef typename ImageMaskSpatialObjectType::RegionType ImageMaskRegionType;
-  ImageMaskRegionType mask_region = mask->GetAxisAlignedBoundingBoxRegion();
-  
+  //typedef itk::ImageMaskSpatialObject<itkGetStaticConstMacro(FixedImageDimension)> ImageMaskSpatialObjectType;
+  //typename ImageMaskSpatialObjectType::ConstPointer mask = dynamic_cast<const ImageMaskSpatialObjectType*>(m_FixedImageMask.GetPointer());
+
+  //typedef typename ImageMaskSpatialObjectType::RegionType ImageMaskRegionType;
+  //ImageMaskRegionType mask_region = mask->GetAxisAlignedBoundingBoxRegion();
+
   // Common properties
-  if( m_FixedImageMask.IsNotNull() )  
+  if( m_FixedImageMask.IsNotNull() )
     m_Metric->SetFixedImageMask(m_FixedImageMask);
-  
+
   m_Metric->SetFixedImageRegion(m_FixedImageRegion);
   //m_Metric->SetFixedImageRegion(mask_region);
 
@@ -359,7 +359,7 @@ GenericMetric<args_info_type,FixedImageType, MovingImageType>::GetMetricPointer(
       //RandomIterator randIter( m_FixedImage, mask_region );
       
       if (m_Verbose) std::cout << "Search region " << m_FixedImageRegion << std::endl;
-      if (m_Verbose) std::cout << "Mask search region " << mask_region << std::endl;
+      //if (m_Verbose) std::cout << "Mask search region " << mask_region << std::endl;
 
       // Randomly sample the image
       short att = 1;