r15469 - /branches/frame_order_testing/maths_fns/frame_order.py -- March 08, 2012 - 15:01

Author: bugman
Date: Thu Mar  8 15:01:35 2012
New Revision: 15469

URL: http://svn.gna.org/viewcvs/relax?rev=15469&view=rev
Log:
Import fix for old numpy versions missing float16.


Modified:
    branches/frame_order_testing/maths_fns/frame_order.py

Modified: branches/frame_order_testing/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order.py?rev=15469&r1=15468&r2=15469&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order.py Thu Mar  8 15:01:35 
2012
@@ -26,7 +26,11 @@
 # Python module imports.
 from copy import deepcopy
 from math import acos, ceil, pi, sqrt
-from numpy import array, dot, float16, float64, ones, transpose, zeros
+from numpy import array, dot, float32, float64, ones, transpose, zeros
+try:
+    from numpy import float16
+except ImportError:
+    float16 = float32
 from numpy.linalg import norm
 
 # relax module imports.