Author: bugman Date: Wed Sep 17 17:12:02 2014 New Revision: 25890 URL: http://svn.gna.org/viewcvs/relax?rev=25890&view=rev Log: Fixes for all of the lib.frame_order.*.pcs_numeric_int_*_qrint() functions. The loop over the Sobol' points was broken. As numpy.swapaxes() has been applied to the points argument already, the loop needs to be over the second dimension of the points data structure. Modified: branches/frame_order_cleanup/lib/frame_order/double_rotor.py branches/frame_order_cleanup/lib/frame_order/iso_cone.py branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py branches/frame_order_cleanup/lib/frame_order/rotor.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=25890&r1=25889&r2=25890&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/double_rotor.py (original) +++ branches/frame_order_cleanup/lib/frame_order/double_rotor.py Wed Sep 17 17:12:02 2014 @@ -145,7 +145,7 @@ # Loop over the samples. num = 0 - for i in range(len(points)): + for i in range(len(points[0])): # The maximum number of points has been reached (well, surpassed by one so exit the loop before it is used). if num == max_points: break Modified: branches/frame_order_cleanup/lib/frame_order/iso_cone.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/iso_cone.py?rev=25890&r1=25889&r2=25890&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/iso_cone.py (original) +++ branches/frame_order_cleanup/lib/frame_order/iso_cone.py Wed Sep 17 17:12:02 2014 @@ -102,7 +102,7 @@ # Loop over the samples. num = 0 - for i in range(len(points)): + for i in range(len(points[0])): # The maximum number of points has been reached (well, surpassed by one so exit the loop before it is used). if num == max_points: break Modified: branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py?rev=25890&r1=25889&r2=25890&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py (original) +++ branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py Wed Sep 17 17:12:02 2014 @@ -124,7 +124,7 @@ # Loop over the samples. num = 0 - for i in range(len(points)): + for i in range(len(points[0])): # The maximum number of points has been reached (well, surpassed by one so exit the loop before it is used). if num == max_points: break Modified: branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py?rev=25890&r1=25889&r2=25890&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py (original) +++ branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py Wed Sep 17 17:12:02 2014 @@ -653,7 +653,7 @@ # Loop over the samples. num = 0 - for i in range(len(points)): + for i in range(len(points[0])): # The maximum number of points has been reached (well, surpassed by one so exit the loop before it is used). if num == max_points: break Modified: branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py?rev=25890&r1=25889&r2=25890&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py (original) +++ branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py Wed Sep 17 17:12:02 2014 @@ -320,7 +320,7 @@ # Loop over the samples. num = 0 - for i in range(len(points)): + for i in range(len(points[0])): # The maximum number of points has been reached (well, surpassed by one so exit the loop before it is used). if num == max_points: break 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=25890&r1=25889&r2=25890&view=diff ============================================================================== --- branches/frame_order_cleanup/lib/frame_order/rotor.py (original) +++ branches/frame_order_cleanup/lib/frame_order/rotor.py Wed Sep 17 17:12:02 2014 @@ -121,7 +121,7 @@ # Loop over the samples. num = 0 - for i in range(len(points)): + for i in range(len(points[0])): # The maximum number of points has been reached (well, surpassed by one so exit the loop before it is used). if num == max_points: break