Bug fix

-Fixed error in v1.3.0 with gel_inds, void_inds after new CALMetrics was introduced
-Updated plotting to use CALMetrics.getInds

Author: jttoombs

src/CALOptimize.m

@@ -11,8 +11,6 @@
 
         thresholds
         error
-        gel_inds
-        void_inds
     end
 
     methods
@@ -43,7 +41,6 @@
 
             obj.thresholds = zeros(1,opt_params.max_iter);
             obj.error = zeros(1,opt_params.max_iter);
-            [obj.gel_inds,obj.void_inds] = obj.getInds();
         end
 
         function [obj] = parseParams(obj,opt_params,proj_params)
@@ -130,7 +127,7 @@
                 if ~isnan(obj.opt_params.threshold)
                     curr_threshold = obj.opt_params.threshold;
                 else
-                    curr_threshold = findThreshold(x,obj.target_obj.target,obj.gel_inds,obj.void_inds);
+                    curr_threshold = findThreshold(x,obj.target_obj.target);
                 end
 
                 obj.thresholds(curr_iter) = curr_threshold; % store thresholds as a function of the iteration number
@@ -188,7 +185,7 @@
                 runtime = toc;
                 fprintf('Finished optimization of projections in %.2f seconds\n',runtime);
 
-                display.histogramProjRecon(opt_b,x,obj.gel_inds,obj.void_inds)
+                display.histogramProjRecon(obj.target_obj.target,opt_b,x)
                 display.showProjections(opt_b,'Optimized Projections');
                 display.showDose(x,'Optimized Reconstruction');
                 autoArrangeFigures(2,3)  % automatically arrange figures on screen

src/Display.m

@@ -65,7 +65,11 @@
             grid on
         end
 
-        function [] = histogramProjRecon(b,x,gel_inds,void_inds)
+        function [] = histogramProjRecon(target,b,x)
+            
+            
+            [gel_inds,void_inds] = CALMetrics.getInds(target);
+            
             figure(4)
 
             subplot(2,1,1)

src/findThreshold.m

@@ -1,5 +1,7 @@
-function [thresh] = findThreshold(x,target,gel_inds,void_inds)
-
+function [thresh] = findThreshold(x,target)
+    
+    [gel_inds,void_inds] = CALMetrics.getInds(target);
+    
     thresh_low = min(x,[],'all');
     thresh_high = max(x,[],'all');