r12505 - /branches/bmrb/specific_fns/model_free/bmrb.py -- February 02, 2011 - 13:43

Author: bugman
Date: Wed Feb  2 13:43:13 2011
New Revision: 12505

URL: http://svn.gna.org/viewcvs/relax?rev=12505&view=rev
Log:
The model-free bmrb module is now using the new bmrblib create_nmr_star() 
interface.


Modified:
    branches/bmrb/specific_fns/model_free/bmrb.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=12505&r1=12504&r2=12505&view=diff
==============================================================================
--- branches/bmrb/specific_fns/model_free/bmrb.py (original)
+++ branches/bmrb/specific_fns/model_free/bmrb.py Wed Feb  2 13:43:13 2011
@@ -31,8 +31,7 @@
 
 # relax module imports.
 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
+    import bmrblib
 from generic_fns import bmrb, 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
@@ -287,10 +286,7 @@
         """
 
         # Initialise the NMR-STAR data object.
-        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)
+        star = bmrblib.create_nmr_star('relax_model_free_results', 
file_path, version)
 
         # Read the contents of the STAR formatted file.
         star.read()
@@ -324,10 +320,7 @@
         cdp = pipes.get_pipe()
 
         # Initialise the NMR-STAR data object.
-        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)
+        star = bmrblib.create_nmr_star('relax_model_free_results', 
file_path, version)
 
         # Global minimisation stats.
         global_chi2 = None