diff --git a/zUtil_Deformation/gtReadEBSDMapEulerCTFFile.m b/zUtil_Deformation/gtReadEBSDMapEulerCTFFile.m index 5e8f4690a17babaff27747363351d4026395bcae..5113f015c9f369bff5a9aa0fed82246b7180c6a2 100644 --- a/zUtil_Deformation/gtReadEBSDMapEulerCTFFile.m +++ b/zUtil_Deformation/gtReadEBSDMapEulerCTFFile.m @@ -1,5 +1,5 @@ function [EBSD_e_map, EBSD_r_map, EBSD_mask] = gtReadEBSDMapEulerCTFFile(filename, axes_perm, permute_maps, stretch_axes, phase_id) -% function [EBSD_e_map, EBSD_r_map] = gtReadEBSDMapEulerCSVFile(filename, axes_perm, permute_maps) +% function [EBSD_e_map, EBSD_r_map] = gtReadEBSDMapEulerCTFFile(filename, axes_perm, permute_maps, stretch_axes, phase_id) % Axes permutation allows to easily deal with different reference % systems, like for instance: % DCT Axes <-> EBSD Axes ([x y z] <-> [x'y'z']) diff --git a/zUtil_Deformation/plotting/gt6DMakePhaseFigureForPaper.m b/zUtil_Deformation/plotting/gt6DMakePhaseFigureForPaper.m index 19101ade22da1cdefa592859ba08418b08b1d771..a73fdb438a1b67091135d26834727275057e2793 100644 --- a/zUtil_Deformation/plotting/gt6DMakePhaseFigureForPaper.m +++ b/zUtil_Deformation/plotting/gt6DMakePhaseFigureForPaper.m @@ -18,7 +18,7 @@ function gt6DMakePhaseFigureForPaper( phase_mat, phase_id, varargin ) conf = struct( ... 'lims_u', [], ... 'lims_v', [], ... - 'ipf_plane_normal', [], ... + 'ipf_axis', [], ... 'use_dmvol', true, ... 'abs_vol', [], ... 'abs_mask', [], ... @@ -40,7 +40,7 @@ function gt6DMakePhaseFigureForPaper( phase_mat, phase_id, varargin ) r_vecs = reshape(slice_rod, [], 3); r_vecs = r_vecs(indx, :); - cmap = get_cmap(r_vecs, phase_id, conf.ipf_plane_normal); + cmap = get_cmap(r_vecs, phase_id, conf.ipf_axis); slice_R = zeros(size(slice_ids)); slice_G = zeros(size(slice_ids)); @@ -56,7 +56,7 @@ function gt6DMakePhaseFigureForPaper( phase_mat, phase_id, varargin ) gids(gids < 1) = []; r_vecs = sample.phases{phase_id}.R_vector(gids, :); - cmap = get_cmap(r_vecs, phase_id, conf.ipf_plane_normal); + cmap = get_cmap(r_vecs, phase_id, conf.ipf_axis); slice_R = zeros(size(slice_ids)); slice_G = zeros(size(slice_ids)); @@ -188,13 +188,13 @@ function slice = get_slice(vol, plane, slice_idx) end end -function cmap = get_cmap(r_vecs, phase_id, ipf_plane_normal) +function cmap = get_cmap(r_vecs, phase_id, ipf_axis) p = gtLoadParameters(); cryst_system = p.cryst(phase_id).crystal_system; cryst_spacegroup = p.cryst(phase_id).spacegroup; symm = gtCrystGetSymmetryOperators(cryst_system, cryst_spacegroup); - [cmap, ~, ~] = gtIPFCmap(phase_id, ipf_plane_normal, ... + [cmap, ~, ~] = gtIPFCmap(phase_id, ipf_axis, ... 'r_vectors', r_vecs, ... 'crystal_system', cryst_system, ... 'background', false, ... diff --git a/zUtil_Deformation/plotting/gt6DRenderEBSDMapIPF.m b/zUtil_Deformation/plotting/gt6DRenderEBSDMapIPF.m index 9596ca506932c50ad508ae2a64c2eeee874363d4..0796ffff24a02bcd6d644baf226bb16886a5918e 100644 --- a/zUtil_Deformation/plotting/gt6DRenderEBSDMapIPF.m +++ b/zUtil_Deformation/plotting/gt6DRenderEBSDMapIPF.m @@ -2,7 +2,7 @@ function gt6DRenderEBSDMapIPF(EBSD_r_map, phase_id, varargin) conf = struct( ... 'mask', [], ... - 'ipf_plane_normal', [], ... + 'ipf_axis', [], ... 'flip_ud', false, ... 'flip_lr', false, .... 'clims', [], ... @@ -35,7 +35,7 @@ function gt6DRenderEBSDMapIPF(EBSD_r_map, phase_id, varargin) r_vecs = reshape(EBSD_r_map, [], 3); r_vecs = r_vecs(indx, :); - cmap = get_cmap(r_vecs, phase_id, conf.ipf_plane_normal); + cmap = get_cmap(r_vecs, phase_id, conf.ipf_axis); slice_R = zeros(size(slice_ids)); slice_G = zeros(size(slice_ids)); @@ -108,13 +108,13 @@ function gt6DRenderEBSDMapIPF(EBSD_r_map, phase_id, varargin) end end -function cmap = get_cmap(r_vecs, phase_id, ipf_plane_normal) +function cmap = get_cmap(r_vecs, phase_id, ipf_axis) p = gtLoadParameters(); cryst_system = p.cryst(phase_id).crystal_system; cryst_spacegroup = p.cryst(phase_id).spacegroup; symm = gtCrystGetSymmetryOperators(cryst_system, cryst_spacegroup); - [cmap, ~, ~] = gtIPFCmap(phase_id, ipf_plane_normal, ... + [cmap, ~, ~] = gtIPFCmap(phase_id, ipf_axis, ... 'r_vectors', r_vecs, ... 'crystal_system', cryst_system, ... 'background', false, ... diff --git a/zUtil_TomoUtils/GtEBSDView.m b/zUtil_TomoUtils/GtEBSDView.m index 447785a0fd250eed3602b8f8da1cbd8939818968..26f311e9e36345680feb7839e42066a417572a5e 100644 --- a/zUtil_TomoUtils/GtEBSDView.m +++ b/zUtil_TomoUtils/GtEBSDView.m @@ -13,7 +13,7 @@ classdef GtEBSDView < GtBaseGuiElem self.conf.ebsd_map = ebsd_map; self.conf.mask = []; - self.conf.ipf_plane_normal = []; + self.conf.ipf_axis = []; self.conf.phase_id = 1; self.conf.horDim = 1; @@ -265,7 +265,7 @@ classdef GtEBSDView < GtBaseGuiElem r_vecs = r_vecs(indx, :); [cmap, ~, ~] = gtIPFCmap( ... - self.conf.phase_id, self.conf.ipf_plane_normal, ... + self.conf.phase_id, self.conf.ipf_axis, ... 'r_vectors', r_vecs, ... 'crystal_system', cryst_system, ... 'background', false, ...