r12493 - /branches/bmrb/specific_fns/model_free/bmrb.py -- February 01, 2011 - 20:07

Author: bugman
Date: Tue Feb  1 20:07:46 2011
New Revision: 12493

URL: http://svn.gna.org/viewcvs/relax?rev=12493&view=rev
Log:
specific_fns.model_free.bmrb now uses the generic_fns.bmrb functions derived 
from itself.


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=12493&r1=12492&r2=12493&view=diff
==============================================================================
--- branches/bmrb/specific_fns/model_free/bmrb.py (original)
+++ branches/bmrb/specific_fns/model_free/bmrb.py Tue Feb  1 20:07:46 2011
@@ -33,8 +33,7 @@
 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 generic_fns import diffusion_tensor, exp_info, mol_res_spin, pipes, 
relax_data
-from generic_fns.bmrb import generate_sequence
+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
 from relax_warnings import RelaxWarning
@@ -129,11 +128,7 @@
                 setattr(cdp, 'chi2', data['global_chi2'])
 
             # The number of spins.
-            N = 0
-            if data['data_ids']:
-                N = len(data['data_ids'])
-            elif data['s2']:
-                N = len(data['s2'])
+            N = bmrb.num_spins(data)
 
             # No data in the saveframe.
             if N == 0:
@@ -148,7 +143,7 @@
                 
spin_ids.append(mol_res_spin.generate_spin_id(mol_name=mol_names[i], 
res_num=data['res_nums'][i], spin_name=data['atom_names'][i]))
 
             # Generate the sequence if needed.
-            generate_sequence(N, spin_ids=spin_ids, 
spin_names=data['atom_names'], res_nums=data['res_nums'], 
res_names=data['res_names'], mol_names=mol_names)
+            bmrb.generate_sequence(N, spin_ids=spin_ids, 
spin_names=data['atom_names'], res_nums=data['res_nums'], 
res_names=data['res_names'], mol_names=mol_names)
 
             # Correlation time scaling.
             table = {'s':   1.0,