r12688 - /branches/relax_data/test_suite/system_tests/scripts/bmrb_rw.py -- March 02, 2011 - 10:13

Author: bugman
Date: Wed Mar  2 10:13:34 2011
New Revision: 12688

URL: http://svn.gna.org/viewcvs/relax?rev=12688&view=rev
Log:
Updated the BMRB reading and writing system test script for the new relax 
data ID string design.


Modified:
    branches/relax_data/test_suite/system_tests/scripts/bmrb_rw.py

Modified: branches/relax_data/test_suite/system_tests/scripts/bmrb_rw.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/test_suite/system_tests/scripts/bmrb_rw.py?rev=12688&r1=12687&r2=12688&view=diff
==============================================================================
--- branches/relax_data/test_suite/system_tests/scripts/bmrb_rw.py (original)
+++ branches/relax_data/test_suite/system_tests/scripts/bmrb_rw.py Wed Mar  2 
10:13:34 2011
@@ -36,15 +36,14 @@
 bmrb.thiol_state(state='reduced')
 
 # Display the data (as a test).
-relax_data.display(ri_label='R1', frq_label='800')
+relax_data.display(ri_id='R1_800')
 
 # Temperature control and peak intensity type.
-ri_labels = ['R1', 'R2', 'NOE', 'R1', 'R2', 'NOE']
-frq_labels = ['600', '600', '600', '800', '800', '800']
+ri_ids = ['R1_600', 'R2_600', 'NOE_600', 'R1_800', 'R2_800', 'NOE_800']
 for i in range(6):
-    relax_data.temp_calibration(ri_label=ri_labels[i], 
frq_label=frq_labels[i], method='methanol')
-    relax_data.temp_control(ri_label=ri_labels[i], frq_label=frq_labels[i], 
method='single fid interleaving')
-    relax_data.peak_intensity_type(ri_label=ri_labels[i], 
frq_label=frq_labels[i], type='height')
+    relax_data.temp_calibration(ri_id=ri_ids[i], method='methanol')
+    relax_data.temp_control(ri_id=ri_ids[i], method='single fid 
interleaving')
+    relax_data.peak_intensity_type(ri_id=ri_ids[i], type='height')
 
 # Set up some BMRB information.
 bmrb.software_select('NMRPipe')
@@ -62,7 +61,7 @@
 
 # Display tests.
 sequence.display()
-relax_data.display(ri_label='R1', frq_label='800')
+relax_data.display(ri_id='R1_800')
 
 # Save the program state.
 state.save(state_file, force=True)