r22138 - /trunk/test_suite/shared_data/frame_order/cam/generate_base.py -- February 06, 2014 - 12:33

Author: bugman
Date: Thu Feb  6 12:33:29 2014
New Revision: 22138

URL: http://svn.gna.org/viewcvs/relax?rev=22138&view=rev
Log:
Fix for bug #21605, the failure of the 
Frame_order.test_generate_rotor2_distribution system test.

The bug at http://gna.org/bugs/?21605 is due to the fact that numpy.float16 
is not defined on all
systems.  Older numpy versions do not have this.  Therefore the float16 value 
is now imported from
lib.check_types where it is aliased to float32 when not defined.


Modified:
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py

Modified: trunk/test_suite/shared_data/frame_order/cam/generate_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/generate_base.py?rev=22138&r1=22137&r2=22138&view=diff
==============================================================================
--- trunk/test_suite/shared_data/frame_order/cam/generate_base.py (original)
+++ trunk/test_suite/shared_data/frame_order/cam/generate_base.py Thu Feb  6 
12:33:29 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2012-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2012-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -24,12 +24,13 @@
 
 # Python module imports.
 from math import pi
-from numpy import array, cross, dot, float16, float64, transpose, zeros
+from numpy import array, cross, dot, float64, transpose, zeros
 from numpy.linalg import norm
 from os import getcwd, sep
 import sys
 
 # relax module imports.
+from lib.check_types import float16
 from lib.frame_order.format import print_frame_order_2nd_degree
 from lib.geometry.coord_transform import cartesian_to_spherical
 from lib.geometry.rotations import axis_angle_to_R, R_to_euler_zyz