Merge pull request #57 from cheesema/debugging

Handling case where the highest resolution < l_max, was causing some …

Author: cheesema

src/algorithm/APRConverter.hpp

@@ -585,7 +585,7 @@ void APRConverter<ImageType>::auto_parameters(const MeshData<T>& input_img){
         }
     }
 
-    T mean = counter > 0 ? total_p/(counter*1.0) : 1;
+    float mean = counter > 0 ? total_p/(counter*1.0) : 1;
 
     //now compute the standard deviation (sd) of the patches
 
@@ -641,7 +641,7 @@ void APRConverter<ImageType>::auto_parameters(const MeshData<T>& input_img){
     }
 
     float Ip_th = mean + sd;
-    float var_th = (img_mean/mean)*sd*min_snr;
+    float var_th = (img_mean/(mean*1.0f))*sd*min_snr;
 
     float var_th_max = sd*min_snr*.5f;
 

src/data_structures/APR/APRAccess.hpp

@@ -563,14 +563,15 @@ class APRAccess {
         apr_timer.start_timer("forth loop");
 
         //iteration helpers for by level
-        global_index_by_level_begin.resize(apr.level_max()+1,0);
+        global_index_by_level_begin.resize(apr.level_max()+1,1);
         global_index_by_level_end.resize(apr.level_max()+1,0);
 
         cumsum= 0;
 
         total_number_gaps=0;
 
         uint64_t min_level_find = apr.level_max();
+        uint64_t max_level_find = apr.level_min();
 
         //set up the iteration helpers for by zslice
         global_index_by_level_and_z_begin.resize(apr.level_max()+1);
@@ -596,6 +597,7 @@ class APRAccess {
                     for (int j = 0; j < y_begin.data[i][offset_pc_data].size(); ++j) {
 
                         min_level_find = std::min(i,min_level_find);
+                        max_level_find = std::max(i,max_level_find);
 
                         y_begin.data[i][offset_pc_data][j].second.global_index_begin = cumsum;
 
@@ -626,6 +628,7 @@ class APRAccess {
 
         //set minimum level now to the first non-empty level.
         level_min = min_level_find;
+        level_max = max_level_find;
 
         total_number_non_empty_rows=0;