r22146 - in /branches/double_rotor: ./ test_suite/shared_data/frame_order/cam/generate_base.py -- February 07, 2014 - 11:32

Author: bugman
Date: Fri Feb  7 11:32:09 2014
New Revision: 22146

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

........
  r22138 | bugman | 2014-02-06 12:33:29 +0100 (Thu, 06 Feb 2014) | 7 lines
  
  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:
    branches/double_rotor/   (props changed)
    
branches/double_rotor/test_suite/shared_data/frame_order/cam/generate_base.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb  7 11:32:09 2014
@@ -1,1 +1,1 @@
-/trunk:1-22112,22115-22118,22125-22137
+/trunk:1-22112,22115-22118,22125-22138

Modified: 
branches/double_rotor/test_suite/shared_data/frame_order/cam/generate_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/shared_data/frame_order/cam/generate_base.py?rev=22146&r1=22145&r2=22146&view=diff
==============================================================================
--- 
branches/double_rotor/test_suite/shared_data/frame_order/cam/generate_base.py 
(original)
+++ 
branches/double_rotor/test_suite/shared_data/frame_order/cam/generate_base.py 
Fri Feb  7 11:32:09 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,13 +24,13 @@
 
 # Python module imports.
 from math import pi
-from numpy import array, cross, dot, eye, float16, float64, transpose, zeros
+from numpy import array, cross, dot, eye, float64, transpose, zeros
 from numpy.linalg import norm
 from os import getcwd, sep
 import sys
 
 # relax module imports.
-from lib.check_types import is_float
+from lib.check_types import float16, is_float
 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