gtForwardSimulation: moved ondet/included/selected to proj, and removed unused shift field

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

zUtil_Deformation/gt6DCreateProjDataFromExtendedGrain.m

@@ -341,8 +341,6 @@ function [refor, estim_space_bbox_pix, estim_orient_bbox] = gt6DCreateProjDataFr
     proj.vol_size_y = vol_size(1);
     proj.vol_size_z = vol_size(3);
 
-    proj.shift = gtFwdSimComputeVolumeShifts(proj, p);
-
     refor.proj = proj;
     refor.bb_ors = or;
 

zUtil_Deformation/gt6DCreateProjDataFromGrainCluster.m

@@ -337,8 +337,6 @@ function [refor, estim_space_bbox_pix, estim_orient_bbox] = gt6DCreateProjDataFr
     proj.vol_size_y = vol_size(1);
     proj.vol_size_z = vol_size(3);
 
-    proj.shift = gtFwdSimComputeVolumeShifts(proj, p);
-
     proj.ondet = ref_ondet;
     proj.included = ref_included;
 

zUtil_ForwardSim/gtForwardSimulate_v2.m

@@ -475,10 +475,6 @@ for n = first : last
     out.phaseid   = phaseID;
     out.R_vector  = gr.R_vector;
     out.center    = gr.center;
-
-    out.selected  = selected; % vector of logicals with pre-selected spots active
-    out.included  = included;
-    out.ondet     = onDet;
     out.allblobs  = gr.allblobs;
 
     out.check     = check;
@@ -503,6 +499,10 @@ for n = first : last
 
     % diffraction geometry
     out.proj       = proj;
+    % Selections
+    out.proj.ondet    = onDet;
+    out.proj.included = included;
+    out.proj.selected = selected; % logicals with pre-selected active spots
     % blob/spot stacks
     out.proj.bl    = bl(included);
     out.proj.stack = difstack(:, included, :);

zUtil_ForwardSim/gtFwdSimBuildProjGeometry.m

@@ -63,7 +63,5 @@ function proj = gtFwdSimBuildProjGeometry(diff_beam_dirs, gr_center, omegas, bb,
     proj.vol_size_x = vol_size(2);
     proj.vol_size_y = vol_size(1);
     proj.vol_size_z = vol_size(3);
-
-    proj.shift = gtFwdSimComputeVolumeShifts(proj, parameters);
 end