r24728 - in /branches/frame_order_cleanup: ./ specific_analyses/frame_order/parameter_object.py -- July 24, 2014 - 18:27

Author: bugman
Date: Thu Jul 24 18:27:44 2014
New Revision: 24728

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

........
  r24727 | bugman | 2014-07-24 18:23:39 +0200 (Thu, 24 Jul 2014) | 7 lines
  
  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:
    branches/frame_order_cleanup/   (props changed)
    
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 24 18:27:44 2014
@@ -1 +1 @@
-/trunk:1-24725
+/trunk:1-24727

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py?rev=24728&r1=24727&r2=24728&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
      (original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
      Thu Jul 24 18:27:44 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):