diff --git a/4_grains/gtCalculateGrain_p.m b/4_grains/gtCalculateGrain_p.m index 4fd21dbe659fc6260ff85217740bec64296f97c1..06f3bdc45ba6815da2d86eeb4f90dfaaa19dea5b 100644 --- a/4_grains/gtCalculateGrain_p.m +++ b/4_grains/gtCalculateGrain_p.m @@ -553,7 +553,8 @@ for det_ind = app.det_ind end for ii_gr = 1:num_grains - % Initialse output variables + allblobs = gtGrainAllblobsDefinition(); + allblobs.type = mode; allblobs.plcry = plcry(:, :, ii_gr); @@ -598,6 +599,8 @@ for det_ind = app.det_ind grain{ii_gr}.allblobs(det_ind) = allblobs; end else + allblobs = gtGrainAllblobsDefinition(); + allblobs.type = mode; allblobs.plcry = plcry; allblobs.plorig = plorig; diff --git a/7_fed2/gtFedPredictOmegaMultiple.m b/7_fed2/gtFedPredictOmegaMultiple.m index a813e30b924af4f7cc768d99eacdf846983c8f42..bff52da8cbadebf178cc53daae2ec61538698841 100644 --- a/7_fed2/gtFedPredictOmegaMultiple.m +++ b/7_fed2/gtFedPredictOmegaMultiple.m @@ -48,10 +48,12 @@ function [om, plrot, plsigned, rot, omind] = gtFedPredictOmegaMultiple(... % plrot - the plane normals rotated in the diffraction positions; % no. 3 and 4 are inverted after rotation (pointing oppposite % to beam) to ease calculation at a later stage; -% size (3xn or 3xnx4) +% size (3xn or 3xnx4) (in LAB coordinates) % plsigned - the original input plane normals with no. 3 and 4 inverted; +% in Sam coordinates % plrot(:,i,j) = rot(:,:,i,j)*plsigned(:,i,j) the is where (3xn or 3xnx4) % rot - rotation matrices (3x3xn or 3x3xnx4) +% Saml->Lab for column vectors, Lab->Sam for row vectors % omind - omega indices (1xn or 4xn) % @@ -165,7 +167,7 @@ else om([1 2], chom) = om([2 1], chom); omind([1 2], chom) = omind([2 1], chom); - % ROTATION MATRICES AND PLANE NORMALS IN LAB + % ROTATION MATRICES AND PLANE NORMALS IN LAB (plsigned still in SAM) plsigned = zeros(3, nn, 4); plsigned(:, :, 1) = pl;