local changes - commit in order to enable updating

4_grains/gtShowFsim.m

@@ -149,21 +149,21 @@ function gtShowFsim(grain, phaseid, clims)
         h(5) = plot(1, -10, 'gh');
     end
 
-    % flag = 6  spot claimed by another grain
-    ind   = find(grain.flag == 6);
-    u_vec = grain.allblobs.uv(ondet(ind), 1);
-    v_vec = grain.allblobs.uv(ondet(ind), 2);
-    if ~isempty(ind)
-        h(6) = plot(u_vec,v_vec,'yo', 'MarkerSize', 20);
-    else
-        h(6) = plot(1, -10, 'yo', 'MarkerSize', 20);
-    end
-
-    % Only in case we have it
     if (hasConflictInfo)
-        text(x, y, num2str(id'), 'Color', 'y')
-    end
+        % flag = 6  spot claimed by another grain
+        ind   = find(grain.flag == 6);
+        u_vec = grain.allblobs.uv(ondet(ind), 1);
+        v_vec = grain.allblobs.uv(ondet(ind), 2);
+        if ~isempty(ind)
+            h(6) = plot(u_vec,v_vec,'yo', 'MarkerSize', 20);
+        else
+            h(6) = plot(1, -10, 'yo', 'MarkerSize', 20);
+        end
 
+        % Only in case we have it
+        text(x,y,num2str(id'),'Color','y')
+    end
+  
     % flag = 0  no spot search - just show expected positions
     ind = find(grain.flag == 0);
     if ~isempty(ind == length(grain.flag))

5_reconstruction/gtForwardSimulate_v2.m

@@ -513,6 +513,10 @@ function spotsRecords = initializeSpotsRecords(dataset_name)
     [difspotIDs, CentroidXs, CentroidYs, CentroidImages, BoundingBoxXsizes, ...
         BoundingBoxYsizes, BoundingBoxXorigins, BoundingBoxYorigins] = mym(query);
 
+    % create vectors of size (numspots,1)  (these will have some empty elements since
+    % not all difspotIDs exist  (some are filtered out because fo size
+    % restrictions, for example)
+
     numspots = max(difspotIDs);
     spotsRecords                    = [];
     spotsRecords.difspotID          = NaN(numspots, 1);