r12749 - /branches/relax_data/test_suite/system_tests/scripts/model_free/generate_ri.py -- March 02, 2011 - 21:13

Author: bugman
Date: Wed Mar  2 21:13:26 2011
New Revision: 12749

URL: http://svn.gna.org/viewcvs/relax?rev=12749&view=rev
Log:
Simplifications to the generate_ri.py model-free system test script.

The error calculation function is not required and all functions have been 
eliminated.


Modified:
    
branches/relax_data/test_suite/system_tests/scripts/model_free/generate_ri.py

Modified: 
branches/relax_data/test_suite/system_tests/scripts/model_free/generate_ri.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/test_suite/system_tests/scripts/model_free/generate_ri.py?rev=12749&r1=12748&r2=12749&view=diff
==============================================================================
--- 
branches/relax_data/test_suite/system_tests/scripts/model_free/generate_ri.py 
(original)
+++ 
branches/relax_data/test_suite/system_tests/scripts/model_free/generate_ri.py 
Wed Mar  2 21:13:26 2011
@@ -31,42 +31,6 @@
 from status import Status; status = Status()
 
 
-def back_calc():
-    """Function for back calculating the relaxation data."""
-
-    relax_data.back_calc(ri_id='NOE_600', ri_type='NOE', frq=600e6)
-
-
-def errors():
-    """Function for generating relaxation data errors."""
-
-    # Loop over the sequence.
-    for spin in spin_loop():
-        # Loop over the relaxation data.
-        for ri_id in cdp.ri_ids:
-            # No data.
-            if spin.ri_data[ri_id] == None:
-                continue
-
-            # 600 MHz NOE.
-            if cdp.ri_ids[ri_id] == 'NOE_600':
-                spin.ri_data_err[ri_id] = 0.04
-
-            # 500 MHz NOE.
-            elif cdp.ri_ids[ri_id] == 'NOE_500':
-                spin.ri_data_err[ri_id] = 0.05
-
-            # All other data.
-            else:
-                spin.ri_data_err[ri_id] = spin.ri_data[ri_id] * 0.02
-
-
-def write():
-    """Function for writing the relaxation data to file."""
-
-    relax_data.write(ri_id='NOE_600', file='devnull', force=True)
-
-
 # Create the data pipe.
 pipe.create('test', 'mf')
 
@@ -93,11 +57,8 @@
 # Select model-free model m2.
 model_free.select_model(model='m2')
 
-# Back calculate the relaxation data.
-back_calc()
-
-# Generate the errors.
-errors()
+# Back calculate some relaxation data.
+relax_data.back_calc(ri_id='NOE_600', ri_type='NOE', frq=600e6)
 
 # Write the data.
-write()
+relax_data.write(ri_id='NOE_600', file='devnull', force=True)