Skip to content
Snippets Groups Projects
Commit 6c342ef6 authored by Laura Nervo's avatar Laura Nervo
Browse files

gtDisorientation : changed third output argument name to 'mis_info'


Signed-off-by: default avatarLaura Nervo <laura.nervo@esrf.fr>
parent c6d426e6
No related branches found
No related tags found
No related merge requests found
function [mis_angle, mis_axis, info] = gtDisorientation(ori1, ori2, symm, varargin)
function [mis_angle, mis_axis, mis_info] = gtDisorientation(ori1, ori2, symm, varargin)
% GTDISORIENTATION Easy function to calculate the disorientation angle and axis
% between two sets of grains
%
......@@ -25,7 +25,7 @@ function [mis_angle, mis_axis, info] = gtDisorientation(ori1, ori2, symm, vararg
% OUTPUT:
% mis_angle = <double> Misorientation angles between the 2 grain sets
% mis_axis = <double> Misorientation axes between the 2 grain sets
% info = <struct> Extra info
% mis_info = <struct> Extra info
%
% Verison 002 24-10-2013 by LNervo, laura.nervo@esrf.fr
% Added argument 'convention'
......@@ -99,11 +99,9 @@ if nargout > 1
for ii = 1:Ngrain1;
gA = g1(:, :, ii);
gB = g2(:, :, ii);
[mis_angle(ii), mis_axis(ii, :), info] = calcDisorientation(gA, gB, Symm);
[mis_angle(ii), mis_axis(ii, :), mis_info] = calcDisorientation(gA, gB, Symm);
tmp_info(ii) = gtAddMatFile(tmp_info(ii), info, true);
tmp_info(ii).mis_angle = mis_angle(ii, :);
tmp_info(ii).mis_axis = mis_axis(ii, :);
tmp_info(ii) = gtAddMatFile(tmp_info(ii), mis_info, true);
if (~isempty(par.latticepar)) && par.latticepar(6) == 120 % it must be hexagonal
mis_axis_hex_cart(ii, 1:4) = gtCart2Hex(mis_axis(ii,:), par.latticepar, par.convention);
......@@ -117,7 +115,7 @@ if nargout > 1
end
end
if nargout > 2
info = tmp_info;
mis_info = tmp_info;
end
else
for ii = 1:Ngrain1;
......
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