Fixed incoming beam intensity computation

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

4_grains/gtComputeIncomingBeamIntensity.m

 function [gr, refs] = gtComputeIncomingBeamIntensity(gr, parameters, refs)
 % FUNCTION [gr, refs] = gtComputeIncomingBeamIntensity(gr, parameters, refs)
 
-    if (parameters.acq.interlaced_turns > 0)
-        error('gtComputeIncomingBeamIntensity:wrong_conf', ...
-            'Interlaced turns not supported, yet!')
-    end
-    omega_step = 180 / parameters.acq.nproj;
-
     if (isfield(gr.proj, 'ondet'))
         gr_included = gr.proj.ondet(gr.proj.included);
     else
         gr_included = gr.ondet(gr.included);
     end
 
+    omega_step = gtGetOmegaStepDeg(parameters);
+
     omegas = gr.allblobs.omega(gr_included);
     gc_det_pos = gtGeoGrainCenterSam2Det(gr.center, omegas, parameters);
     rounded_gc_det = round(gc_det_pos);
 
     img_nums = omegas / omega_step;
 
-    min_ws = floor(img_nums / parameters.acq.refon)+1;
-    max_ws = min_ws + 1;
+    if (parameters.acq.interlaced_turns > 0)
+        error('gtComputeIncomingBeamIntensity:wrong_conf', ...
+            'Interlaced turns not supported, yet!')
+
+        % TO BE FINISHED
+        min_ws = floor(img_nums);
+        max_ws = min_ws + 1;
+
+        min_cs = max_ws - img_nums;
+        max_cs = 1 - min_cs;
 
-    min_cs = (max_ws - (img_nums / parameters.acq.refon) -1);
-    max_cs = 1 - min_cs;
+        min_min_ref_ws = floor(min_ws / parameters.acq.refon) + 1;
+        min_max_ref_ws = floor(max_ws / parameters.acq.refon) + 1;
+        max_min_ref_ws = min_min_ref_ws + 1;
+        max_max_ref_ws = min_max_ref_ws + 1;
+    else
+        min_ref_ws = floor(img_nums / parameters.acq.refon) + 1;
+        max_ref_ws = min_ref_ws + 1;
+
+        min_cs = (max_ref_ws - (img_nums / parameters.acq.refon) - 1);
+        max_cs = 1 - min_cs;
+    end
 
     if (~exist('refs', 'var'))
         refs = load_reference_imgs(parameters);
     end
 
     max_selection = max_cs > 1e-4;
-    min_indx = sub2ind(size(refs), rounded_gc_det(:, 2), rounded_gc_det(:, 1), min_ws);
-    max_indx = sub2ind(size(refs), rounded_gc_det(max_selection, 2), rounded_gc_det(max_selection, 1), max_ws(max_selection));
+    min_indx = sub2ind(size(refs), rounded_gc_det(:, 2), rounded_gc_det(:, 1), min_ref_ws);
+    max_indx = sub2ind(size(refs), rounded_gc_det(max_selection, 2), rounded_gc_det(max_selection, 1), max_ref_ws(max_selection));
     min_vals = refs(min_indx) .* min_cs;
     max_vals = refs(max_indx) .* max_cs(max_selection);