From 894a8de9f9a163082a81547a3cc8229fbc7e8500 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Thu, 19 Nov 2020 14:31:14 +0100
Subject: [PATCH] avoid name clash: as_Rodrigues_vector(vector = ...)

---
 python/damask/_orientation.py | 4 ++--
 python/damask/_rotation.py    | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/python/damask/_orientation.py b/python/damask/_orientation.py
index 5f0889135..5595a9693 100644
--- a/python/damask/_orientation.py
+++ b/python/damask/_orientation.py
@@ -469,7 +469,7 @@ class Orientation(Rotation):
         if self.family is None:
             raise ValueError('Missing crystal symmetry')
 
-        rho_abs = np.abs(self.as_Rodrigues_vector(vector=True))
+        rho_abs = np.abs(self.as_Rodrigues_vector(compact=True))
 
         with np.errstate(invalid='ignore'):
             # using '*'/prod for 'and'
@@ -512,7 +512,7 @@ class Orientation(Rotation):
         if self.family is None:
             raise ValueError('Missing crystal symmetry')
 
-        rho = self.as_Rodrigues_vector(vector=True)
+        rho = self.as_Rodrigues_vector(compact=True)
 
         with np.errstate(invalid='ignore'):
             if   self.family == 'cubic':
diff --git a/python/damask/_rotation.py b/python/damask/_rotation.py
index a5e534244..fc713401b 100644
--- a/python/damask/_rotation.py
+++ b/python/damask/_rotation.py
@@ -357,7 +357,7 @@ class Rotation:
         return Rotation._qu2om(self.quaternion)
 
     def as_Rodrigues_vector(self,
-                            vector = False):
+                            compact = False):
         """
         Represent as Rodrigues-Frank vector with separated axis and angle argument.
 
@@ -375,7 +375,7 @@ class Rotation:
 
         """
         ro = Rotation._qu2ro(self.quaternion)
-        if vector:
+        if compact:
             with np.errstate(invalid='ignore'):
                 return ro[...,:3]*ro[...,3:4]
         else:
@@ -595,13 +595,12 @@ class Rotation:
                               P = -1,
                               **kwargs):
         """
-        Initialize from Rodrigues-Frank vector.
+        Initialize from Rodrigues-Frank vector (angle separated from axis).
 
         Parameters
         ----------
         rho : numpy.ndarray of shape (...,4)
-            Rodrigues-Frank vector (angle separated from axis).
-            (n_1, n_2, n_3, tan(ω/2)), ǀnǀ = 1  and ω ∈ [0,π].
+            Rodrigues-Frank vector. (n_1, n_2, n_3, tan(ω/2)), ǀnǀ = 1  and ω ∈ [0,π].
         normalize : boolean, optional
             Allow ǀnǀ ≠ 1. Defaults to False.
         P : int ∈ {-1,1}, optional