IPF: speedup if we have some information already

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

6_rendering/gtIPFCmap.m

@@ -44,8 +44,10 @@ function [cmap, Vsst, Vc_symm, vargs_out] = gtIPFCmap(phaseid, LD, varargin)
 par.saturate       = true;
 par.save           = false;
 par.crystal_system = '';
+par.spacegroup     = '';
 par.r_vectors      = [];
 par.background     = true;
+par.symm           = [];
 [par, rej_pars] = parse_pv_pairs(par, varargin);
 
 if ~exist('phaseid', 'var') || isempty(phaseid)
@@ -76,9 +78,13 @@ if size(r_vectors, 2) == 4
 end
 
 % Get the crystal system
-if isempty(par.crystal_system)
-    parameters = load('parameters.mat');
-    par.crystal_system = parameters.parameters.cryst(phaseid).crystal_system;
+if (isempty(par.crystal_system) || isempty(par.spacegroup))
+    parameters = gtLoadParameters();
+    par.crystal_system = parameters.cryst(phaseid).crystal_system;
+    par.spacegroup = parameters.cryst(phaseid).spacegroup;
+end
+if (isempty(par.symm))
+    par.symm = gtCrystGetSymmetryOperators(par.crystal_system, par.spacegroup);
 end
 
 % Compute all orientation matrices g
@@ -90,7 +96,7 @@ all_g = gtMathsRod2OriMat(r_vectors.');
 LDc = gtVectorLab2Cryst(LD, all_g);
 
 % Get the color and vector in the SST triangle
-[cmap, Vsst, ~, Vc_symm] = gtCrystVector2SST(LDc, par.crystal_system, [], par.saturate);
+[cmap, Vsst, ~, Vc_symm] = gtCrystVector2SST(LDc, par.crystal_system, par.symm, par.saturate);
 
 if (par.background)
     cmap = [ 0 0 0 ; cmap ];
@@ -105,7 +111,7 @@ if (par.save)
     disp(['IPF cmap saved in ' fileName])
 end
 
-if nargout > 3
+if (nargout > 3)
     par.r_vectors      = r_vectors;
     par.phaseid        = phaseid;
     par.samDir         = LD;

zUtil_Cryst/gtCrystVector2SST.m

@@ -24,12 +24,12 @@ function [rgb, Vsst, Vsst_p, Vc_symm] = gtCrystVector2SST(Vc, crystal_system, sy
 %
 %    Version 001 15-10-2012 by YGuilhem
 
-    if ~exist('saturate', 'var') || isempty(saturate)
+    if (~exist('saturate', 'var') || isempty(saturate))
         saturate = true;
     end
 
     % Get symmetry operators and store g3 operators into an array
-    if ~exist('symm', 'var') || isempty(symm)
+    if (~exist('symm', 'var') || isempty(symm))
         symm = gtCrystGetSymmetryOperators(crystal_system);
     end
     symm = reshape(cell2mat({symm.g3}), 3, 3, []);