Conflicts : add useful grainid lists in '4_grains/out.mat' file to analyze the conflicts

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@713 4c865b51-4357-4376-afb4-474e03ccb993

5_reconstruction/gtSolveGrainsConflicts.m

@@ -208,12 +208,18 @@ for phaseid = 1 : num_phases
     % get remaining conflicts
     conflicts = phase.getAllValuesFromSummaryField('idconflict',false);
     [conflicts, indexes_c] = sfgetSinglesValues(conflicts, []);
-        
+    
+    conflicts_out = [indexes_c, conflicts];
+    conflicts_unique = unique(sort(conflicts_out,2),'rows');
+    conflicts_list = unique(sort(conflicts_out,1));
+    
     % saving information
     
     out{phaseid}.deselected_grains = [indexes_desel, idconflicts_desel];
     out{phaseid}.modified_grains   = [indexes_c_max, idconflicts_max];
     out{phaseid}.conflicts_grains  = [indexes_c, conflicts];
+    out{phaseid}.conflicts_list    = conflicts_list;
+    out{phaseid}.conflicts_unique  = conflicts_unique;
     out{phaseid}.spot2grain        = {spot2grain, spot2phase};
 
     sample.phases{phaseid} = phase;