From 6c342ef6e5daec3cfb937d91ac8b4fd9747fe9f2 Mon Sep 17 00:00:00 2001
From: Laura Nervo <laura.nervo@esrf.fr>
Date: Thu, 14 Nov 2013 15:59:50 +0100
Subject: [PATCH] gtDisorientation : changed third output argument name to
'mis_info'
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>
---
zUtil_Cryst/gtDisorientation.m | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/zUtil_Cryst/gtDisorientation.m b/zUtil_Cryst/gtDisorientation.m
index a06c3056..12cfd125 100644
--- a/zUtil_Cryst/gtDisorientation.m
+++ b/zUtil_Cryst/gtDisorientation.m
@@ -1,4 +1,4 @@
-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;
--
GitLab