r24733 - /branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py -- July 25, 2014 - 09:03

Author: bugman
Date: Fri Jul 25 09:03:18 2014
New Revision: 24733

URL: http://svn.gna.org/viewcvs/relax?rev=24733&view=rev
Log:
Increased the default grid bounds for the pivot parameters of the frame order 
models.

The pivot point is now searched for in a 50 Angstrom box and the pivot 
displacement for the double
motion models from 10 to 60 Angstroms.  These were originally a 20 Angstrom 
box and 10 to 50
Angstroms.  The larger grid is possible when combined with the new zooming 
grid search.


Modified:
    
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py

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=24733&r1=24732&r2=24733&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
      Fri Jul 25 09:03:18 2014
@@ -106,7 +106,7 @@
     return pi * (1.0 - 1.0/(incs+1))
 
 
-def pivot_grid_bound(param=None, extent=10.0):
+def pivot_grid_bound(param=None, extent=25.0):
     """Determine the grid bounds for the pivot coordinates.
 
     @keyword param:     The parameter to find the bound for.  This should be 
one of 'pivot_x', 'pivot_y', or 'pivot_z'.
@@ -128,7 +128,7 @@
     return val + extent
 
 
-def pivot_x_lower(incs=None, model_info=None, size=10.0):
+def pivot_x_lower(incs=None, model_info=None, size=25.0):
     """Determine the lower grid bound for the pivot X coordinate.
 
     @keyword incs:          The number of grid search increments.
@@ -145,7 +145,7 @@
     return pivot_grid_bound(param='pivot_x', extent=-size)
 
 
-def pivot_x_upper(incs=None, model_info=None, size=10.0):
+def pivot_x_upper(incs=None, model_info=None, size=25.0):
     """Determine the upper grid bound for the pivot X coordinate.
 
     @keyword incs:          The number of grid search increments.
@@ -162,7 +162,7 @@
     return pivot_grid_bound(param='pivot_x', extent=size)
 
 
-def pivot_y_lower(incs=None, model_info=None, size=10.0):
+def pivot_y_lower(incs=None, model_info=None, size=25.0):
     """Determine the lower grid bound for the pivot Y coordinate.
 
     @keyword incs:          The number of grid search increments.
@@ -179,7 +179,7 @@
     return pivot_grid_bound(param='pivot_y', extent=-size)
 
 
-def pivot_y_upper(incs=None, model_info=None, size=10.0):
+def pivot_y_upper(incs=None, model_info=None, size=25.0):
     """Determine the upper grid bound for the pivot Y coordinate.
 
     @keyword incs:          The number of grid search increments.
@@ -196,7 +196,7 @@
     return pivot_grid_bound(param='pivot_y', extent=size)
 
 
-def pivot_z_lower(incs=None, model_info=None, size=10.0):
+def pivot_z_lower(incs=None, model_info=None, size=25.0):
     """Determine the lower grid bound for the pivot Z coordinate.
 
     @keyword incs:          The number of grid search increments.
@@ -213,7 +213,7 @@
     return pivot_grid_bound(param='pivot_z', extent=-size)
 
 
-def pivot_z_upper(incs=None, model_info=None, size=10.0):
+def pivot_z_upper(incs=None, model_info=None, size=25.0):
     """Determine the upper grid bound for the pivot Z coordinate.
 
     @keyword incs:          The number of grid search increments.
@@ -297,7 +297,7 @@
             py_type = float,
             set = 'params',
             grid_lower  =  10.0,
-            grid_upper  =  50.0,
+            grid_upper  =  60.0,
             err = True,
             sim = True
         )