Problems with Meld / rebase. Use version from origin/master

Signed-off-by: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>

4_grains/gtCalculateGrain.m

@@ -394,7 +394,15 @@ for det_ind = app.det_ind
     dvecsam = gtGeoLab2Sam(dveclab, rot_l2s, labgeo, samgeo, true);
 
     % Let's convert grain center Sam -> Lab
-    [~, shifts_sam] = gtMatchGetSampleShifts(parameters, om);
+    if isfield(parameters.acq, 'correct_sample_shifts')
+        if parameters.acq.correct_sample_shifts
+            [~, shifts_sam] = gtMatchGetSampleShifts(parameters, om);
+        else
+            shifts_sam = 0;
+        end
+    else
+        shifts_sam = 0;
+    end
 
     gcsam_v = gcsam(ones(1, size(rot_l2s, 3)), :) + shifts_sam;
     gclab_v_t = gtGeoSam2Lab(gcsam_v, rot_s2l, labgeo, samgeo, false)';