gtINDEXMatchGrains : add output with conflicts list results

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

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

zUtil_Indexter/gtINDEXMatchGrains.m

-function [match, dev, dcm, drotm] = gtIndexMatchGrains2(grain1, grain2, ...
+function [match, dev, dcm, drotm, pippo] = gtINDEXMatchGrains(grain1, grain2, ...
                                     ph1, dc, drot, tol)
 
 % GTINDEXMATCHGRAINS Matches multiple indexed grains between two datasets.
 %
-% [match, dev, dcm, drotm] = gtIndexMatchGrains2(grain1, grain2, ...
+% [match, dev, dcm, drotm] = gtINDEXMatchGrains(grain1, grain2, ...
 %                                                ph1, dc, drot, tol)
 %
 % For each grain in the reference set 'grain1' it tries to find the 
@@ -375,6 +375,8 @@ end
 
 disp('Matching grains ...')
 
+pippo = zeros(size(nof_grains1),1);
+
 for ii = 1:nof_grains1
 
     % Actual grain data
@@ -413,16 +415,25 @@ for ii = 1:nof_grains1
 
 		match(ii,2) = tomatch(1);
 
+        if length(tomatch) > 1
+            pippo(ii) = tomatch(2);
+        else
+            pippo(ii) = NaN;
+        end
+        
+    else
+        pippo(ii) = [];
 	end
 
 end
 
+pippo = [find(~isnan(pippo))' pippo(~isnan(pippo))'];
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Evalute grain match
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 dev.xyz   = NaN(nof_grains1,3);
 dev.Rvec  = NaN(nof_grains1,3);
 dev.dist  = NaN(nof_grains1,1);