[Cctbx-cvs] SF.net SVN: cctbx:[12214] trunk/scitbx/math/zernike_moments.h

[<hg...@us...>]

Revision: 12214
          http://cctbx.svn.sourceforge.net/cctbx/?rev=12214&view=rev
Author:   hgliu
Date:     2011-01-13 21:41:31 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
zernike moment bug cleared

Modified Paths:
--------------
    trunk/scitbx/math/zernike_moments.h

Modified: trunk/scitbx/math/zernike_moments.h
===================================================================
--- trunk/scitbx/math/zernike_moments.h	2011-01-13 19:44:26 UTC (rev 12213)
+++ trunk/scitbx/math/zernike_moments.h	2011-01-13 21:41:31 UTC (rev 12214)
@@ -79,8 +79,7 @@
         }
 
         initialize_voxel();
-        if(!uniform)
-          find_nbr();
+        find_nbr();
         xyz2voxel();
   //      std::string info( print_status() );
 
@@ -190,10 +189,6 @@
       }
 
       void mark_region_uniform(int xi, int yi, int zi, FloatType density) {
-/*        for(int i=xi-splat_range_;i<=xi+splat_range_;i++)
-          for(int j=yi-splat_range_;j<=yi+splat_range_;j++)
-            for(int k=zi-splat_range_;k<=zi+splat_range_;k++)
- */
         int i,j,k;
         for(int n=0;n<n_nbr_;n++) {
           i=xi+neighbors_[n][0];
@@ -206,11 +201,6 @@
       }
 
       void mark_region_non_uniform(int xi, int yi, int zi, FloatType density) {
-       /* for(int i=xi-splat_range_;i<=xi+splat_range_;i++)
-          for(int j=yi-splat_range_;j<=yi+splat_range_;j++)
-            for(int k=zi-splat_range_;k<=zi+splat_range_;k++)
-              value_[i][j][k] += density;  //non-uniform
-*/
         int i,j,k;
         for(int n=0;n<n_nbr_;n++) {
           i=xi+neighbors_[n][0];
@@ -226,7 +216,7 @@
         int i,j,k;
         int n_tot=2*NP_+1;
         int n_pt, indx, n2(n_tot*n_tot);
-        af::shared< af::shared< af::shared<FloatType> > > new_value = value_.deep_copy();
+//        af::shared< af::shared< af::shared<FloatType> > > new_value = value_.deep_copy();
         af::shared< scitbx::vec3<int> > border_list;
         af::shared< int > border_indices;
         find_nearest_nbr();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.