r11643 - in /branches/bmrb: specific_fns/model_free/bmrb.py test_suite/system_tests/scripts/bmrb_rw.py -- October 20, 2010 - 20:04

Author: bugman
Date: Wed Oct 20 20:04:43 2010
New Revision: 11643

URL: http://svn.gna.org/viewcvs/relax?rev=11643&view=rev
Log:
Removed the v3.2 BMRB imports as these no longer exist.

There is no 3.2 version!


Modified:
    branches/bmrb/specific_fns/model_free/bmrb.py
    branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py

Modified: branches/bmrb/specific_fns/model_free/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/specific_fns/model_free/bmrb.py?rev=11643&r1=11642&r2=11643&view=diff
==============================================================================
--- branches/bmrb/specific_fns/model_free/bmrb.py (original)
+++ branches/bmrb/specific_fns/model_free/bmrb.py Wed Oct 20 20:04:43 2010
@@ -32,7 +32,6 @@
 if dep_check.bmrblib_module:
     from bmrblib.nmr_star_dict import NMR_STAR
     from bmrblib.nmr_star_dict_v3_1 import NMR_STAR_v3_1
-    from bmrblib.nmr_star_dict_v3_2 import NMR_STAR_v3_2
 from generic_fns import diffusion_tensor, exp_info, mol_res_spin, pipes, 
relax_data
 from generic_fns.mol_res_spin import get_molecule_names, spin_loop
 from relax_errors import RelaxError
@@ -49,9 +48,7 @@
         """
 
         # Initialise the NMR-STAR data object.
-        if version == '3.2':
-            star = NMR_STAR_v3_2('relax_model_free_results', file_path)
-        elif version == '3.1':
+        if version == '3.1':
             star = NMR_STAR_v3_1('relax_model_free_results', file_path)
         else:
             star = NMR_STAR('relax_model_free_results', file_path)
@@ -79,9 +76,7 @@
         cdp = pipes.get_pipe()
 
         # Initialise the NMR-STAR data object.
-        if version == '3.2':
-            star = NMR_STAR_v3_2('relax_model_free_results', file_path)
-        elif version == '3.1':
+        if version == '3.1':
             star = NMR_STAR_v3_1('relax_model_free_results', file_path)
         else:
             star = NMR_STAR('relax_model_free_results', file_path)

Modified: branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py?rev=11643&r1=11642&r2=11643&view=diff
==============================================================================
--- branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py (original)
+++ branches/bmrb/test_suite/system_tests/scripts/bmrb_rw.py Wed Oct 20 
20:04:43 2010
@@ -14,7 +14,7 @@
 if not hasattr(ds, 'tmpfile'):
     stand_alone = True
     ds.tmpfile = 'temp_bmrb'
-    ds.version = '3.2'
+    ds.version = '3.1'
     state_file = 'temp_bmrb_state'
 
 # Create the data pipe.