6D-Phantom/Cluster: fixed bug with included spots

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

zUtil_Deformation/gt6DCreateProjDataFromGrainCluster.m

@@ -56,13 +56,14 @@ function [proj, refor, or] = gt6DCreateProjDataFromGrainCluster(grs_list, phase_
 
     if (isfield(refgr.proj, 'ondet'))
         ref_ondet = refgr.proj.ondet;
-        ref_included = ref_ondet(refgr.proj.included);
+        ref_included = refgr.proj.included;
         ref_selected = refgr.proj.selected;
     else
         ref_ondet = refgr.ondet;
-        ref_included = ref_ondet(refgr.included);
+        ref_included = refgr.included;
         ref_selected = refgr.selected;
     end
+    fwdsim_sel_refl = ref_ondet(ref_included(ref_selected));
 
     space_bboxes = zeros(num_grains, 6);
     for ii_g = 1:num_grains
@@ -153,12 +154,12 @@ function [proj, refor, or] = gt6DCreateProjDataFromGrainCluster(grs_list, phase_
     end
 
     or_abs = cat(1, or(:).allblobs);
-    uvw_tab = zeros(numel(ref_included(ref_selected)), num_ors, 3);
+    uvw_tab = zeros(numel(fwdsim_sel_refl), num_ors, 3);
     for ii_g = 1:num_ors
         if (isfield(or_abs(1), 'detector'))
-            uvw_tab(:, ii_g, :) = or_abs(ii_g).detector(1).uvw(ref_included(ref_selected), :);
+            uvw_tab(:, ii_g, :) = or_abs(ii_g).detector(1).uvw(fwdsim_sel_refl, :);
         else
-            uvw_tab(:, ii_g, :) = or_abs(ii_g).uvw(ref_included(ref_selected), :);
+            uvw_tab(:, ii_g, :) = or_abs(ii_g).uvw(fwdsim_sel_refl, :);
         end
     end
 
@@ -170,7 +171,7 @@ function [proj, refor, or] = gt6DCreateProjDataFromGrainCluster(grs_list, phase_
     refor = gtGrainAllblobsFilterOrder(refor, refgr_omind_ind);
 
     num_images = gtGetTotNumberOfImages(p);
-    refor_ws = refor.allblobs.omega(ref_included(ref_selected)) / p.labgeo.omstep;
+    refor_ws = refor.allblobs.omega(fwdsim_sel_refl) / p.labgeo.omstep;
 
     % Let's treat those blobs at the w edge 360->0
     % (from the sampled orientations perspective)
@@ -188,7 +189,7 @@ function [proj, refor, or] = gt6DCreateProjDataFromGrainCluster(grs_list, phase_
         squeeze(floor(min(uvw_tab, [], 2))), ...
         squeeze( ceil(max(uvw_tab, [], 2))) ];
 
-    refor_ns = refor.allblobs.eta(ref_included(ref_selected));
+    refor_ns = refor.allblobs.eta(fwdsim_sel_refl);
 
     img_sizes = img_bboxes(:, 4:6) - img_bboxes(:, 1:3) + 1;
     if (conf.verbose)