Fixed bugs related to some previous changes with the diffractometer and orientation sampling

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

zUtil_Deformation/gtDefFwdProjGvdm2UVP.m

@@ -21,7 +21,7 @@ function bl = gtDefFwdProjGvdm2UVP(grain, selectedph, gv, fedpars, parameters, d
     detgeo = parameters.detgeo(det_ind);
     labgeo = parameters.labgeo;
     samgeo = parameters.samgeo;
-    diff = parameters.diffractometer;
+    diff = parameters.diffractometer(det_ind);
 
     rotcomp = gtMathsRotationMatrixComp(diff.axes_basetilt', 'col');
     rotdir = diff.axes_basetilt';
@@ -59,7 +59,8 @@ function bl = gtDefFwdProjGvdm2UVP(grain, selectedph, gv, fedpars, parameters, d
     phinds = grain.allblobs(det_ind).phind(selectedph);
 
     tilts = parameters.acq(det_ind).sample_tilts;
-    instr_t = gtGeoDiffractometerTensor(diff, 'sam2lab', 'angles_sam_tilt', tilts, 'angles_rotation', omega);
+    instr_t = gtGeoDiffractometerTensor(diff, 'sam2lab', ...
+        'angles_sam_tilt', tilts, 'angles_rotation', omega);
 
     if (isfield(fedpars, 'detector') ...
             && isfield(fedpars.detector, 'psf') ...
@@ -163,8 +164,9 @@ function bl = gtDefFwdProjGvdm2UVP(grain, selectedph, gv, fedpars, parameters, d
             % Diffraction vector
             dvec_lab = gtFedPredictDiffVecMultiple(pllab, labgeo.beamdir');
 
-            rot_s2l_tot = gtGeoDiffractometerTensor(diff, 'sam2lab', true, ...
-                'angles_sam_tilt', tilts, 'angles_rotation', omega(ii_b), 'angles_basetilt', ph);
+            rot_s2l_tot = gtGeoDiffractometerTensor(diff, 'sam2lab', ...
+                'angles_sam_tilt', tilts, 'angles_rotation', omega(ii_b), ...
+                'angles_basetilt', ph);
 
             gvcs_lab = gtGeoSam2Lab(gvpcs, rot_s2l_tot, labgeo, samgeo, false, 'element_wise', element_wise_gcs);
 

zUtil_Deformation/gtDefSyntheticGrainCreate.m

@@ -198,15 +198,10 @@ if (isfield(grain, 'id'))
     grain.id = 1;
 end
 grain = struct('id', grain.id, 'phaseid', grain.phaseid, ...
-    'center', grain.center, 'R_vector', grain.R_vector);
+    'center', grain.center, 'R_vector', grain.R_vector, ...
+    'allblobs', grain.allblobs );
 
-if (isfield(fedpars, 'pl_ind'))
-    pl_ind = fedpars.pl_ind;
-else
-    pl_ind = [];
-end
-
-grain = gtCalculateGrain(grain, parameters, 'det_ind', det_ind, 'pl_ind', pl_ind);
+grain = gtCalculateGrain(grain, parameters, 'det_ind', det_ind);
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Iinitial blob parameters