GtOrientationSampling: migrated to the new gtCalculateGrain's omind/included work

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

zUtil_Deformation/GtOrientationSampling.m

@@ -599,6 +599,9 @@ classdef GtOrientationSampling < handle
                 bbpos(ii,:) = [self.bl(ii).bbuim(1) self.bl(ii).bbvim(1) self.bl(ii).bbsize(1:2)];
             end
 
+            ref_omind = self.ref_gr.allblobs.omind;
+            ref_included = self.ondet(self.included);
+
             fprintf('Computing geometries: ')
             c = tic();
             for o_ii = 1:numel(self.lattice)
@@ -621,37 +624,38 @@ classdef GtOrientationSampling < handle
                 switch(2)
                     case 3 % All in once
                         num_chars_gr = fprintf('gtCalculateGrain in parallel..');
-                        self.lattice(o_ii).gr = gtCalculateGrain_p(self.lattice(o_ii).gr, self.parameters);
+                        self.lattice(o_ii).gr = gtCalculateGrain_p( ...
+                            self.lattice(o_ii).gr, self.parameters, ...
+                            'ref_omind', ref_omind, 'included', ref_included );
                     case 2 % In chunks
                         num_chars_gr = fprintf('gtCalculateGrain in chunks: ');
                         chunk_size = 1000;
                         for ii = 1:chunk_size:num_orients
                             end_chunk = min(ii+chunk_size, num_orients);
                             num_chars_gr_ii = fprintf('%05d/%05d', ii, num_orients);
-                            self.lattice(o_ii).gr(ii:end_chunk) = ...
-                                gtCalculateGrain_p(self.lattice(o_ii).gr(ii:end_chunk), self.parameters);
+                            self.lattice(o_ii).gr(ii:end_chunk) = gtCalculateGrain_p( ...
+                                self.lattice(o_ii).gr(ii:end_chunk), self.parameters, ...
+                                'ref_omind', ref_omind, 'included', ref_included );
                             fprintf(repmat('\b', [1 num_chars_gr_ii]));
                         end
+                        fprintf(repmat(' ', [1 num_chars_gr_ii]));
+                        fprintf(repmat('\b', [1 num_chars_gr_ii]));
                     case 1 % One by One
                         num_chars_gr = fprintf('gtCalculateGrain: ');
                         for ii = 1:num_orients
                             num_chars_gr_ii = fprintf('%05d/%05d', ii, num_orients);
-                            self.lattice(o_ii).gr{ii} = gtCalculateGrain(self.lattice(o_ii).gr{ii}, self.parameters);
+                            self.lattice(o_ii).gr{ii} = gtCalculateGrain( ...
+                                self.lattice(o_ii).gr{ii}, self.parameters, ...
+                                'ref_omind', ref_omind, 'included', ref_included );
                             fprintf(repmat('\b', [1 num_chars_gr_ii]));
                         end
+                        fprintf(repmat(' ', [1 num_chars_gr_ii]));
+                        fprintf(repmat('\b', [1 num_chars_gr_ii]));
                 end
                 fprintf(repmat('\b', [1 num_chars_gr]));
                 fprintf(repmat(' ', [1 num_chars_gr]));
                 fprintf(repmat('\b', [1 num_chars_gr]));
 
-                num_chars_gr = fprintf('filtering unneeded "allblobs" fields..');
-                self.lattice(o_ii).gr = GtOrientationSampling.selectBlobsFromGrains( ...
-                    self.lattice(o_ii).gr, self.ref_gr.allblobs.omind, ...
-                    self.ondet(self.included));
-                fprintf(repmat('\b', [1 num_chars_gr]));
-                fprintf(repmat(' ', [1 num_chars_gr]));
-                fprintf(repmat('\b', [1 num_chars_gr]));
-
                 num_chars_gr = fprintf('computing projection geometries..');
                 bbpos_oi = repmat(bbpos, [num_orients, 1]);
 
@@ -697,6 +701,9 @@ classdef GtOrientationSampling < handle
                 bbpos(b_ii, :) = [sbl.bbuim(1), sbl.bbvim(1), sbl.bbsize(1:2)];
             end
 
+            ref_omind = self.ref_gr.allblobs.omind;
+            ref_included = self.ondet(self.included);
+
             fprintf('Computing super-sampling geometries: ')
             c = tic();
             for o_ii = 1:numel(self.lattice_ss)
@@ -705,11 +712,10 @@ classdef GtOrientationSampling < handle
 
                 for g_ii = 1:num_orients
                     num_chars_gr_ii = fprintf('%05d/%05d', g_ii, num_orients);
-                    self.lattice_ss(o_ii).gr{g_ii} = gtCalculateGrain_p(self.lattice_ss(o_ii).gr{g_ii}, self.parameters);
 
-                    self.lattice_ss(o_ii).gr{g_ii} = GtOrientationSampling.selectBlobsFromGrains( ...
-                        self.lattice_ss(o_ii).gr{g_ii}, self.ref_gr.allblobs.omind, ...
-                        self.ondet(self.included));
+                    self.lattice_ss(o_ii).gr{g_ii} = gtCalculateGrain_p( ...
+                        self.lattice_ss(o_ii).gr{g_ii}, self.parameters, ...
+                        'ref_omind', ref_omind, 'included', ref_included );
 
                     num_ss_orients = numel(self.lattice_ss(o_ii).gr{g_ii});
                     bbpos_oi = repmat(bbpos, [num_ss_orients, 1]);