Skip to content
Snippets Groups Projects
Commit 54c13a18 authored by Nicola Vigano's avatar Nicola Vigano
Browse files

IPF: small change in doc and name for property

parent 923b404f
No related branches found
No related tags found
No related merge requests found
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'])
......
......@@ -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, ...
......
......@@ -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, ...
......
......@@ -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, ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment