r18347 - in /branches/frame_order_testing: ./ extern/scientific_python/Geometry/Transformation.py -- February 01, 2013 - 12:42

Author: bugman
Date: Fri Feb  1 12:42:40 2013
New Revision: 18347

URL: http://svn.gna.org/viewcvs/relax?rev=18347&view=rev
Log:
Merged revisions 18345 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18345 | bugman | 2013-02-01 12:39:47 +0100 (Fri, 01 Feb 2013) | 17 lines
  
  Python 3 fixes for the newly included Geometry.Transformation 
ScientificPython module.
  
  The command used was:
  2to3 -w \
  -f buffer \
  -f idioms \
  -f set_literal \
  -f ws_comma \
  -x except \
  -x import \
  -x imports \
  -x long \
  -x numliterals \
  -x xrange \
  /data/relax/relax-trunk/extern/scientific_python/Geometry/Transformation.py
........

Modified:
    branches/frame_order_testing/   (props changed)
    
branches/frame_order_testing/extern/scientific_python/Geometry/Transformation.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb  1 12:42:40 2013
@@ -1,1 +1,1 @@
-/trunk:1-18343
+/trunk:1-18345

Modified: 
branches/frame_order_testing/extern/scientific_python/Geometry/Transformation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/Geometry/Transformation.py?rev=18347&r1=18346&r2=18347&view=diff
==============================================================================
--- 
branches/frame_order_testing/extern/scientific_python/Geometry/Transformation.py
 (original)
+++ 
branches/frame_order_testing/extern/scientific_python/Geometry/Transformation.py
 Fri Feb  1 12:42:40 2013
@@ -142,10 +142,10 @@
     def screwMotion(self):
         l = self.vector.length()
         if l == 0.:
-            return Geometry.Vector(0.,0.,0.), \
-                   Geometry.Vector(0.,0.,1.), 0., 0.
-        else:
-            return Geometry.Vector(0.,0.,0.), self.vector/l, 0., l
+            return Geometry.Vector(0., 0., 0.), \
+                   Geometry.Vector(0., 0., 1.), 0., 0.
+        else:
+            return Geometry.Vector(0., 0., 0.), self.vector/l, 0., l
 
 #
 # Pure rotation
@@ -196,8 +196,8 @@
         else:
             return 
self.asLinearTransformation()*other.asLinearTransformation()
 
-    def __call__(self,other):
-        if hasattr(other,'is_vector'):
+    def __call__(self, other):
+        if hasattr(other, 'is_vector'):
             return self.tensor*other
         elif hasattr(other, 'is_tensor') and other.rank == 2:
             _rinv=self.tensor.inverse()
@@ -214,7 +214,7 @@
         @rtype: (L{Scientific.Geometry.Vector}, C{float})
         """
         asym = -self.tensor.asymmetricalPart()
-        axis = Geometry.Vector(asym[1,2], asym[2,0], asym[0,1])
+        axis = Geometry.Vector(asym[1, 2], asym[2, 0], asym[0, 1])
         sine = axis.length()
         if abs(sine) > 1.e-10:
             axis = axis/sine
@@ -224,7 +224,7 @@
         else:
             t = 0.5*(self.tensor+Geometry.delta)
             i = N.argmax(t.diagonal().array)
-            axis = (t[i]/N.sqrt(t[i,i])).asVector()
+            axis = (t[i]/N.sqrt(t[i, i])).asVector()
             angle = 0.
             if t.trace() < 2.:
                 angle = N.pi
@@ -349,7 +349,7 @@
         return self
 
     def translation(self):
-        return Translation(Geometry.Vector(0.,0.,0.))
+        return Translation(Geometry.Vector(0., 0., 0.))
 
     def inverse(self):
         return Rotation(self.tensor.transpose())
@@ -542,7 +542,7 @@
 
 if __name__ == '__main__':
 
-    t = Translation(Geometry.Vector(1.,-2.,0))
+    t = Translation(Geometry.Vector(1., -2., 0))
     r = Rotation(Geometry.Vector(0.1, -2., 0.5), 1.e-10)
     q = r.asQuaternion()
     angles = r.threeAngles(Geometry.Vector(1., 0., 0.),