r24482 - in /branches/frame_order_cleanup: lib/frame_order/ target_functions/ -- July 08, 2014 - 17:07

Author: bugman
Date: Tue Jul  8 17:07:24 2014
New Revision: 24482

URL: http://svn.gna.org/viewcvs/relax?rev=24482&view=rev
Log:
Numpy <= 1.6 fixes for the frame order PCS code.

The numpy.linalg.norm function does not have an axis argument in numpy 1.6, 
therefore the
lib.compat.norm() function is now used instead.  This function was created 
exactly for this axis
argument problem.


Modified:
    branches/frame_order_cleanup/lib/frame_order/double_rotor.py
    branches/frame_order_cleanup/lib/frame_order/rotor.py
    branches/frame_order_cleanup/target_functions/frame_order.py

Modified: branches/frame_order_cleanup/lib/frame_order/double_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/double_rotor.py?rev=24482&r1=24481&r2=24482&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/frame_order/double_rotor.py        
(original)
+++ branches/frame_order_cleanup/lib/frame_order/double_rotor.py        Tue 
Jul  8 17:07:24 2014
@@ -25,9 +25,9 @@
 # Python module imports.
 from math import pi, sqrt
 from numpy import add, divide, dot, inner, multiply, sinc, swapaxes, 
tensordot, transpose
-from numpy.linalg import norm
 
 # relax module imports.
+from lib.compat import norm
 from lib.frame_order.matrix_ops import rotate_daeg
 
 

Modified: branches/frame_order_cleanup/lib/frame_order/rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/rotor.py?rev=24482&r1=24481&r2=24482&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/frame_order/rotor.py       (original)
+++ branches/frame_order_cleanup/lib/frame_order/rotor.py       Tue Jul  8 
17:07:24 2014
@@ -25,13 +25,13 @@
 # Python module imports.
 from math import pi, sqrt
 from numpy import divide, dot, inner, multiply, sinc, swapaxes, tensordot, 
transpose
-from numpy.linalg import norm
 try:
     from scipy.integrate import quad
 except ImportError:
     pass
 
 # relax module imports.
+from lib.compat import norm
 from lib.frame_order.matrix_ops import rotate_daeg
 
 

Modified: branches/frame_order_cleanup/target_functions/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/frame_order.py?rev=24482&r1=24481&r2=24482&view=diff
==============================================================================
--- branches/frame_order_cleanup/target_functions/frame_order.py        
(original)
+++ branches/frame_order_cleanup/target_functions/frame_order.py        Tue 
Jul  8 17:07:24 2014
@@ -26,13 +26,13 @@
 from copy import deepcopy
 from math import acos, cos, pi, sin, sqrt
 from numpy import add, array, dot, float64, ones, outer, subtract, 
transpose, uint8, zeros
-from numpy.linalg import norm
 
 # relax module imports.
 from extern.sobol.sobol_lib import i4_sobol_generate
 from lib.alignment.alignment_tensor import to_5D, to_tensor
 from lib.alignment.pcs import pcs_tensor
 from lib.alignment.rdc import rdc_tensor
+from lib.compat import norm
 from lib.errors import RelaxError
 from lib.float import isNaN
 from lib.frame_order.double_rotor import compile_2nd_matrix_double_rotor, 
pcs_numeric_int_double_rotor