r18473 - /branches/frame_order_testing/auto_analyses/frame_order.py -- February 15, 2013 - 09:58

Author: bugman
Date: Fri Feb 15 09:58:08 2013
New Revision: 18473

URL: http://svn.gna.org/viewcvs/relax?rev=18473&view=rev
Log:
Changed the model order in the frame order auto-analysis to have a more 
logical sense.


Modified:
    branches/frame_order_testing/auto_analyses/frame_order.py

Modified: branches/frame_order_testing/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/auto_analyses/frame_order.py?rev=18473&r1=18472&r2=18473&view=diff
==============================================================================
--- branches/frame_order_testing/auto_analyses/frame_order.py (original)
+++ branches/frame_order_testing/auto_analyses/frame_order.py Fri Feb 15 
09:58:08 2013
@@ -45,7 +45,7 @@
 class Frame_order_analysis:
     """The frame order auto-analysis protocol."""
 
-    def __init__(self, data_pipe_full=None, data_pipe_subset=None, 
pipe_bundle=None, results_dir=None, grid_inc=11, grid_inc_rigid=21, 
min_algor='simplex', num_int_pts_grid=50, num_int_pts_subset=[20, 100], 
func_tol_subset=[1e-2, 1e-2], num_int_pts_full=[100, 1000, 200000], 
func_tol_full=[1e-2, 1e-3, 1e-4], mc_sim_num=500, mc_int_pts=1000, 
mc_func_tol=1e-3, models=['rigid', 'free rotor', 'rotor', 'iso cone, 
torsionless', 'iso cone, free rotor', 'iso cone', 'pseudo-ellipse, 
torsionless', 'pseudo-ellipse']):
+    def __init__(self, data_pipe_full=None, data_pipe_subset=None, 
pipe_bundle=None, results_dir=None, grid_inc=11, grid_inc_rigid=21, 
min_algor='simplex', num_int_pts_grid=50, num_int_pts_subset=[20, 100], 
func_tol_subset=[1e-2, 1e-2], num_int_pts_full=[100, 1000, 200000], 
func_tol_full=[1e-2, 1e-3, 1e-4], mc_sim_num=500, mc_int_pts=1000, 
mc_func_tol=1e-3, models=['rigid', 'free rotor', 'rotor', 'iso cone, free 
rotor', 'iso cone, torsionless', 'iso cone', 'pseudo-ellipse, torsionless', 
'pseudo-ellipse']):
         """Perform the full frame order analysis.
 
         @param data_pipe_full:          The name of the data pipe containing 
all of the RDC and PCS data.