r17800 - /trunk/generic_fns/diffusion_tensor.py -- October 15, 2012 - 10:31

Author: bugman
Date: Mon Oct 15 10:31:28 2012
New Revision: 17800

URL: http://svn.gna.org/viewcvs/relax?rev=17800&view=rev
Log:
Python 2.3 fix - eliminated the superfluous operator.itemgetter() call in the 
diffusion tensor code.


Modified:
    trunk/generic_fns/diffusion_tensor.py

Modified: trunk/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/diffusion_tensor.py?rev=17800&r1=17799&r2=17800&view=diff
==============================================================================
--- trunk/generic_fns/diffusion_tensor.py (original)
+++ trunk/generic_fns/diffusion_tensor.py Mon Oct 15 10:31:28 2012
@@ -27,10 +27,6 @@
 from math import cos, pi, sin
 from numpy import cross, float64, int32, ones, transpose, zeros
 from numpy.linalg import norm, svd
-try:
-    from operator import itemgetter
-except ImportError:
-    pass
 from re import search
 import string
 
@@ -1693,16 +1689,16 @@
         D_diag[i, i] = Di[i]
 
     # Reordering structure.
-    tup_struct = []
+    reorder_data = []
     for i in range(3):
-        tup_struct.append((i, Di[i]))
+        reorder_data.append([Di[i], i])
+    reorder_data.sort()
 
     # The indices.
-    reorder_data = sorted(tup_struct, key=itemgetter(1))
     reorder = zeros(3, int)
     Di_sort = zeros(3, float)
     for i in range(3):
-        reorder[i], Di_sort[i] = reorder_data[i]
+        Di_sort[i], reorder[i] = reorder_data[i]
 
     # Reorder columns.
     R_new = zeros((3, 3), float64)