r11692 - /branches/bmrb/test_suite/system_tests/bmrb.py -- November 22, 2010 - 19:12

Author: bugman
Date: Mon Nov 22 19:12:19 2010
New Revision: 11692

URL: http://svn.gna.org/viewcvs/relax?rev=11692&view=rev
Log:
The version 3.0 BMRB system test now skips the local_tm and diffusion data.

The old NMR-STAR definition cannot support this data.


Modified:
    branches/bmrb/test_suite/system_tests/bmrb.py

Modified: branches/bmrb/test_suite/system_tests/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/bmrb.py?rev=11692&r1=11691&r2=11692&view=diff
==============================================================================
--- branches/bmrb/test_suite/system_tests/bmrb.py (original)
+++ branches/bmrb/test_suite/system_tests/bmrb.py Mon Nov 22 19:12:19 2010
@@ -57,7 +57,7 @@
         ds.__reset__()
 
 
-    def data_check(self, old_pipe_name='results', new_pipe_name='new'):
+    def data_check(self, old_pipe_name='results', new_pipe_name='new', 
version=None):
         """Check that all data has been successfully restored from the BMRB 
files."""
 
         # Print out.
@@ -65,6 +65,8 @@
 
         # Blacklists (data that is not restored, and relaxation data which 
has been reordered).
         blacklist_spin = ['attached_proton', 'fixed', 'nucleus', 
'proton_type', 'relax_sim_data', 'select', 'xh_vect'] + ['r', 'r_err', 
'csa_err'] + ['chi2_sim', 'f_count', 'g_count', 'h_count', 'iter', 'warning'] 
+ ['frq', 'frq_labels', 'noe_r1_table', 'remap_table', 'ri_labels', 
'relax_data', 'relax_error']
+        if version == '3.0':
+            blacklist_spin = blacklist_spin + ['local_tm', 'local_tm_err']
         blacklist_diff = []
         blacklist_global = ['diff_tensor', 'exp_info', 'hybrid_pipes', 
'mol', 'sim_number', 'sim_state'] + ['frq', 'frq_labels', 'noe_r1_table', 
'remap_table', 'ri_labels']
 
@@ -99,8 +101,9 @@
                         self.data_ri_comp(label='Global', 
cont_old=old_pipe.mol[i].res[j].spin[k], 
cont_new=new_pipe.mol[i].res[j].spin[k])
 
         # The diffusion tensor.
-        self.assert_(hasattr(new_pipe, 'diff_tensor'))
-        self.data_cont_comp(label='Diff tensor', 
cont_old=old_pipe.diff_tensor, cont_new=new_pipe.diff_tensor, prec=4, 
blacklist=blacklist_diff)
+        if version != '3.0':
+            self.assert_(hasattr(new_pipe, 'diff_tensor'))
+            self.data_cont_comp(label='Diff tensor', 
cont_old=old_pipe.diff_tensor, cont_new=new_pipe.diff_tensor, prec=4, 
blacklist=blacklist_diff)
 
         # The global data structures.
         self.data_cont_comp(label='Global', cont_old=old_pipe, 
cont_new=new_pipe, blacklist=blacklist_global)
@@ -223,7 +226,7 @@
         self.interpreter.run(script_file=__main__.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
 
         # Test the data.
-        self.data_check()
+        self.data_check(version='3.0')
 
 
     def test_rw_bmrb_3_1_model_free(self):
@@ -236,4 +239,4 @@
         self.interpreter.run(script_file=__main__.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bmrb_rw.py')
 
         # Test the data.
-        self.data_check()
+        self.data_check(version='3.1')