r24727 - /trunk/specific_analyses/frame_order/parameter_object.py -- July 24, 2014 - 18:23

Author: bugman
Date: Thu Jul 24 18:23:39 2014
New Revision: 24727

URL: http://svn.gna.org/viewcvs/relax?rev=24727&view=rev
Log:
Even more even spacing for the frame order grid search.

This is for the parameters which exclude end points in the grid search, as 
these excluded points do
not decrease the number of increments searched over.  This fixes the 
algorithm for all of the
bounds.


Modified:
    trunk/specific_analyses/frame_order/parameter_object.py

Modified: trunk/specific_analyses/frame_order/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameter_object.py?rev=24727&r1=24726&r2=24727&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/parameter_object.py     (original)
+++ trunk/specific_analyses/frame_order/parameter_object.py     Thu Jul 24 
18:23:39 2014
@@ -46,7 +46,7 @@
         return 2.0 * pi
 
     # Return the upper limit which is one inc before 2pi.
-    return 2.0*pi * (1.0 - 1.0/(incs+1))
+    return 2.0*pi * (1.0 - 1.0/incs)
 
 
 def axis_alpha_upper(incs=None, model_info=None):
@@ -65,7 +65,7 @@
         return pi
 
     # Return the upper limit which is one inc before pi.
-    return pi * (1.0 - 1.0/(incs+1))
+    return pi * (1.0 - 2.0/incs)
 
 
 def cone_angle_lower(incs=None, model_info=None):
@@ -84,7 +84,7 @@
         return 0.0
 
     # Return the lower limit, excluding the first point.
-    return pi * (1.0/(incs+2))
+    return pi * (1.0/(incs+1))
 
 
 def cone_angle_upper(incs=None, model_info=None):
@@ -103,7 +103,7 @@
         return pi
 
     # Return the upper limit, excluding the last point.
-    return pi * (1.0 - 1.0/(incs+2))
+    return pi * (1.0 - 1.0/(incs+1))
 
 
 def pivot_grid_bound(param=None, extent=10.0):