FwdProj: reformatted a bit

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

7_fed2/gtFedDefTensorFromComps.m

 function DefT = gtFedDefTensorFromComps(dcin, dcomps, method, eyemode)
-
 % Gives deformation, rotation and strain tensors from the def. components.
 % This function contains the definition (including sign) of the deformation
 % components. Takes multiple input dc-s.
 %
 % SAMPLE coordinate system is orthogonal, right handed [X,Y,Z].
 %
-%
 % INPUT
 %  dcin    - deformation components; see below
 %  dcomps  - true for indices of deformation components present in dcin
@@ -19,7 +17,6 @@ function DefT = gtFedDefTensorFromComps(dcin, dcomps, method, eyemode)
 %             if eyemode=0, it excludes the identity matrix
 %             if eyemode=1, it includes the identity matrix
 %
-%
 % SMALL DEFORMATIONS
 %
 % Deformation components are defined as:
@@ -52,130 +49,72 @@ function DefT = gtFedDefTensorFromComps(dcin, dcomps, method, eyemode)
 %                 dc(9)  dc(5)  dc(7); ...
 %                 dc(8)  dc(7)  dc(6)];
 %
-%
 % LARGE DEFORMATIONS (FINITE DEFORMATION THEORY)
 %   dc(1:3) - orientation dviation expressed as a Rodrigues vector
 %   dc(4:9) - right stretch tensor components (symmetric)
 %
-%    DefT = RotT*RightStretchT
+%    DefT = RotT * RightStretchT
 %
 
-
-if ~islogical(dcomps)
-    error('dcomps needs to be 1x9 vector of logicals.')
-end
-
-% Create dc with 9 components
-dc = zeros(9, size(dcin,2));
-
-dc(dcomps,:) = dcin;
-
-
-if strcmp(method,'small')
-
-    if eyemode
-        DefT = [dc(4,:) + 1     ;...
-                dc(9,:)+dc(3,:) ;...
-                dc(8,:)-dc(2,:) ;...
-                dc(9,:)-dc(3,:) ;...
-                dc(5,:) + 1     ;...
-                dc(7,:)+dc(1,:) ;...
-                dc(8,:)+dc(2,:) ;...
-                dc(7,:)-dc(1,:) ;...
-                dc(6,:) + 1     ];
-    else
-        DefT = [dc(4,:)         ;...
-                dc(9,:)+dc(3,:) ;...
-                dc(8,:)-dc(2,:) ;...
-                dc(9,:)-dc(3,:) ;...
-                dc(5,:)         ;...
-                dc(7,:)+dc(1,:) ;...
-                dc(8,:)+dc(2,:) ;...
-                dc(7,:)-dc(1,:) ;...
-                dc(6,:)         ];
+    if (~islogical(dcomps))
+        error('dcomps needs to be 1x9 vector of logicals.')
     end
 
-    DefT = reshape(DefT,3,3,[]);
-
-
-elseif strcmp(method,'rod_rightstretch')
-
-    %     DefT = zeros(3, 3, size(dc,2));
-    %
-    %     % Rodrigues vector -> normalised rotation vector
-    %     rotdirnorm = sqrt( sum( dc(1:3,:).*dc(1:3,:), 1) );
-    %     rotdir     = dc(1:3,:) ./ rotdirnorm([1 1 1],:);
-    %     rotdir(isnan(rotdir)) = 0;
-    %
-    %     % Angles
-    %     angle = 2*atand(rotdirnorm);
-    %
-    %     for ii = 1:size(dc,2)
-    %
-    %         % Rotation vector -> rotation matrix components
-    %         rotmatcomp = gtMathsRotationMatrixComp(rotdir(:,ii), 'col');
-    %
-    %         % Rotation matrix
-    %         RotT = gtMathsRotationTensor(angle(ii), rotmatcomp);
-    %
-    %         % Right stretch tensor from its components
-    %         RightStretchT = [dc(4,ii), dc(9,ii), dc(8,ii) ; ...
-    %                          dc(9,ii), dc(5,ii), dc(7,ii) ; ...
-    %                          dc(8,ii), dc(7,ii), dc(6,ii) ] + eye(3);
-    %
-    %         DefT(:,:,ii) =  RotT*RightStretchT;
-    %     end
-
-
-
-    %     % Right stretch tensor from its components
-    %     RightStretchT = [dc(4,:) + 1; ...
-    %                      dc(9,:); ...
-    %                      dc(8,:); ...
-    %                      dc(9,:); ...
-    %                      dc(5,:) + 1; ...
-    %                      dc(7,:); ...
-    %                      dc(8,:); ...
-    %                      dc(7,:); ...
-    %                      dc(6,:) + 1  ];
-    %
-    %     RightStretchT = reshape(RightStretchT, 3, []);
-    %
-    %     DefT = RotT.*RightStretchT([1 1 1],:);
-    %     DefT = DefT + RotT.*RightStretchT([2 2 2],:);
-    %     DefT = DefT + RotT.*RightStretchT([3 3 3],:);
-    %
-    %     DefT = reshape(DefT, 3, 3, []);
-
-
-    DefT = zeros(size(dc));
-
-    % Rotation tensors unfolded
-    RotT = reshape(gtFedRod2RotTensor(dc(1:3,:)), 9, []);
-
-    % Multiply rotation tensors and right-stretch tensors
-    rr = RotT.*dc([4 4 4 9 9 9 8 8 8],:);
-    DefT(1:3,:) = rr(1:3,:) + rr(4:6,:) + rr(7:9,:);
-
-    rr = RotT.*dc([9 9 9 5 5 5 7 7 7],:);
-    DefT(4:6,:) = rr(1:3,:) + rr(4:6,:) + rr(7:9,:);
-
-    rr = RotT.*dc([8 8 8 7 7 7 6 6 6],:);
-    DefT(7:9,:) = rr(1:3,:) + rr(4:6,:) + rr(7:9,:);
-
-    % Add the identity component in the right-stretch tensor
-    DefT = DefT + RotT;
-
-
-    DefT = reshape(DefT, 3, 3, []);
-
-    if ~eyemode
-        DefT(1,1,:) = DefT(1,1,:) - 1;
-        DefT(2,2,:) = DefT(2,2,:) - 1;
-        DefT(3,3,:) = DefT(3,3,:) - 1;
+    % Create dc with 9 components
+    dc = zeros(9, size(dcin, 2));
+    dc(dcomps, :) = dcin;
+
+    if strcmp(method, 'small')
+        if (eyemode)
+            DefT = [dc(4,:) + 1     ;...
+                    dc(9,:)+dc(3,:) ;...
+                    dc(8,:)-dc(2,:) ;...
+                    dc(9,:)-dc(3,:) ;...
+                    dc(5,:) + 1     ;...
+                    dc(7,:)+dc(1,:) ;...
+                    dc(8,:)+dc(2,:) ;...
+                    dc(7,:)-dc(1,:) ;...
+                    dc(6,:) + 1     ];
+        else
+            DefT = [dc(4,:)         ;...
+                    dc(9,:)+dc(3,:) ;...
+                    dc(8,:)-dc(2,:) ;...
+                    dc(9,:)-dc(3,:) ;...
+                    dc(5,:)         ;...
+                    dc(7,:)+dc(1,:) ;...
+                    dc(8,:)+dc(2,:) ;...
+                    dc(7,:)-dc(1,:) ;...
+                    dc(6,:)         ];
+        end
+        DefT = reshape(DefT,3,3,[]);
+
+    elseif strcmp(method, 'rod_rightstretch')
+        DefT = zeros(size(dc));
+
+        % Rotation tensors unfolded
+        RotT = gtMathsRod2OriMat(-dc(1:3, :));
+        RotT = reshape(RotT, 9, []);
+
+        % Multiply rotation tensors and right-stretch tensors
+        rr = RotT .* dc([4 4 4 9 9 9 8 8 8], :);
+        DefT(1:3, :) = rr(1:3, :) + rr(4:6,:) + rr(7:9,:);
+
+        rr = RotT .* dc([9 9 9 5 5 5 7 7 7], :);
+        DefT(4:6, :) = rr(1:3, :) + rr(4:6,:) + rr(7:9,:);
+
+        rr = RotT .* dc([8 8 8 7 7 7 6 6 6], :);
+        DefT(7:9, :) = rr(1:3, :) + rr(4:6, :) + rr(7:9, :);
+
+        % Add the identity component in the right-stretch tensor
+        DefT = DefT + RotT;
+
+
+        DefT = reshape(DefT, 3, 3, []);
+
+        if (~eyemode)
+            DefT(1, 1, :) = DefT(1, 1, :) - 1;
+            DefT(2, 2, :) = DefT(2, 2, :) - 1;
+            DefT(3, 3, :) = DefT(3, 3, :) - 1;
+        end
     end
-
 end
-
-
-end % of function

zUtil_Deformation/gtDefFwdProjGvdm2UVW.m

@@ -126,7 +126,7 @@ function bl = gtDefFwdProjGvdm2UVW(grain, ref_sel, gv, fedpars, parameters, det_
             sinth = sinths(ii_b) ./ drel;
 
             % Predict omega angles: 4 for each plane normal
-            [om, pllab, ~, rot_l2s] = gtFedPredictOmegaMultiple(pl_samd, ...
+            [om, pllab, ~, rot_s2l_c] = gtFedPredictOmegaMultiple(pl_samd, ...
                 sinth, labgeo.beamdir', labgeo.rotdir', labgeo.rotcomp, ominds(ii_b));
 
             valid_voxels(:, ii_b) = ~isnan(om);
@@ -143,8 +143,8 @@ function bl = gtDefFwdProjGvdm2UVW(grain, ref_sel, gv, fedpars, parameters, det_
             % Diffraction vector
             dvec_lab = gtFedPredictDiffVecMultiple(pllab, labgeo.beamdir');
 
-            rot_s2l = permute(rot_l2s, [2 1 3]);
-            gvcs_lab = gtGeoSam2Lab(gvpcs', rot_s2l, labgeo, samgeo, false, 'element_wise', element_wise_gcs);
+            rot_s2l_r = permute(rot_s2l_c, [2 1 3]);
+            gvcs_lab = gtGeoSam2Lab(gvpcs', rot_s2l_r, labgeo, samgeo, false, 'element_wise', element_wise_gcs);
 
             uvw_bl = gtFedPredictUVWMultiple([], dvec_lab, gvcs_lab', ...
                 detgeo.detrefpos', detgeo.detnorm', detgeo.Qdet, ...