r12658 - /branches/relax_data/generic_fns/relax_data.py -- March 01, 2011 - 18:05

Author: bugman
Date: Tue Mar  1 18:05:03 2011
New Revision: 12658

URL: http://svn.gna.org/viewcvs/relax?rev=12658&view=rev
Log:
Converted the relax_data.bmrb_read() function to the new ID string design.


Modified:
    branches/relax_data/generic_fns/relax_data.py

Modified: branches/relax_data/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/generic_fns/relax_data.py?rev=12658&r1=12657&r2=12658&view=diff
==============================================================================
--- branches/relax_data/generic_fns/relax_data.py (original)
+++ branches/relax_data/generic_fns/relax_data.py Tue Mar  1 18:05:03 2011
@@ -118,11 +118,14 @@
             continue
 
         # Create the labels.
-        ri_label = data['data_type']
+        ri_type = data['data_type']
         frq = float(data['frq']) * 1e6
 
         # Round the label to the nearest factor of 10.
         frq_label = str(int(round(float(data['frq'])/10)*10))
+
+        # The ID string.
+        ri_id = "%s_%s" % (ri_type, frq_label)
 
         # The number of spins.
         N = bmrb.num_spins(data)
@@ -172,7 +175,7 @@
                         errors[i] = errors[i] * vals[i]**2
 
         # Pack the data.
-        pack_data(ri_label, frq_label, frq, vals, errors, 
mol_names=mol_names, res_nums=data['res_nums'], res_names=data['res_names'], 
spin_nums=None, spin_names=data['atom_names'], gen_seq=True)
+        pack_data(ri_id, ri_type, frq, vals, errors, mol_names=mol_names, 
res_nums=data['res_nums'], res_names=data['res_names'], spin_nums=None, 
spin_names=data['atom_names'], gen_seq=True)