Merge remote-tracking branch 'origin/develop' into develop

mtex-toolbox · Sep 5, 2023 · dde5acc · dde5acc
2 parents e983fbf + e0edcf5
commit dde5acc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/SO3Fun/@SO3VectorFieldHandle/eval.m b/SO3Fun/@SO3VectorFieldHandle/eval.m
@@ -24,8 +24,7 @@
 f = SO3TangentVector(f,SO3VF.tangentSpace);
 if check_option(varargin,'right')
   f = right(f,ori);
-end
-if check_option(varargin,'left')
+elseif check_option(varargin,'left')
   f = left(f,ori);
 end
 

diff --git a/doc/Plotting/CombinedPlots.m b/doc/Plotting/CombinedPlots.m
@@ -10,11 +10,11 @@
 % <matlab:doc('hold') hold off>. Let's demonstrate this using a simple
 % example.
 
-plot([2 2])
+plot([2 2],'LineWidth',2)
 
 hold all
 
-plot([1 3])
+plot([1 3],'LineWidth',2)
 
 hold off
 

diff --git a/geometry/@crystalSymmetry/crystalSymmetry.m b/geometry/@crystalSymmetry/crystalSymmetry.m
@@ -258,6 +258,8 @@
 
           if any(isPerpZ(:))
             s.multiplicityPerpZ = round(2*pi/min(abs(angle(s.rot(isPerpZ)))));
+          else
+            s.multiplicityPerpZ = 1;
           end
         end
         cs = s;

diff --git a/geometry/@specimenSymmetry/specimenSymmetry.m b/geometry/@specimenSymmetry/specimenSymmetry.m
@@ -63,7 +63,19 @@ function display(s)
       % versions
 
        % maybe there is nothing to do
-      if isa(s,'specimenSymmetry'), cs = s; return; end
+      if isa(s,'specimenSymmetry')
+        if isempty(s.multiplicityPerpZ)
+          isPerpZ = isnull(dot(s.rot.axis,zvector)) & ~isnull(s.rot.angle);
+
+          if any(isPerpZ(:))
+            s.multiplicityPerpZ = round(2*pi/min(abs(angle(s.rot(isPerpZ)))));
+          else
+            s.multiplicityPerpZ = 1;
+          end
+        end
+        cs = s; 
+        return; 
+      end
 
       if isfield(s,'rot')
         rot = s.rot;

diff --git a/interfaces/loadODF_VPSC.m b/interfaces/loadODF_VPSC.m
@@ -30,18 +30,14 @@
   ori = orientation.byEuler(d(range,1:3) * degree,cs);
   weights = d(range,4);
 
-  if size(d,2) > 4
-   data = d(range,5:size(d,2));
-  end
-
   odf{k} = calcDensity(ori,'weights',weights,varargin{:}); %#ok<AGROW>
   odf{k}.opt.strain = d(1+(nOri+4)*(k-1),1); %#ok<AGROW>
   odf{k}.opt.strainEllipsoid = d(2+(nOri+4)*(k-1),1:3); %#ok<AGROW>
   odf{k}.opt.strainEllipsoidAngles = d(3+(nOri+4)*(k-1),1:3); %#ok<AGROW>
 
   % also store data (individual orientations, ellipsoids, Taylor factors)
   odf{k}.opt.orientations = ori;
-  odf{k}.opt.data = weights;
+  odf{k}.opt.data = d(range,5:size(d,2));
 
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -258,6 +258,8 @@ @@
               if any(isPerpZ(:))
                 s.multiplicityPerpZ = round(2*pi/min(abs(angle(s.rot(isPerpZ)))));
+              else
+                s.multiplicityPerpZ = 1;
               end
             end
             cs = s;
@@ Expand Down @@