r11652 - /branches/bmrb/generic_fns/relax_data.py -- October 22, 2010 - 17:59

Author: bugman
Date: Fri Oct 22 17:59:25 2010
New Revision: 11652

URL: http://svn.gna.org/viewcvs/relax?rev=11652&view=rev
Log:
The relaxation data reading is functional again, matching the new design of 
bmrblib.


Modified:
    branches/bmrb/generic_fns/relax_data.py

Modified: branches/bmrb/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/relax_data.py?rev=11652&r1=11651&r2=11652&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Fri Oct 22 17:59:25 2010
@@ -220,19 +220,20 @@
     """
 
     # Get the relaxation data.
-    for data_type, frq, entity_ids, res_nums, res_names, spin_names, val, 
err in star.relaxation.loop():
+    for data in star.relaxation.loop():
         # Create the labels.
-        ri_label = data_type
-        frq_label = str(int(frq*1e-6))
+        ri_label = data['data_type']
+        frq = float(data['frq']) * 1e6
+        frq_label = str(int(float(data['frq'])))
 
         # Convert entity IDs to molecule names.
         mol_names = []
         names = get_molecule_names()
-        for id in entity_ids:
+        for id in data['entity_ids']:
             mol_names.append(names[int(id)-1])
 
         # Pack the data.
-        pack_data(ri_label, frq_label, frq, val, err, mol_names=mol_names, 
res_nums=res_nums, res_names=res_names, spin_nums=None, 
spin_names=spin_names, gen_seq=True)
+        pack_data(ri_label, frq_label, frq, data['data'], data['errors'], 
res_nums=data['res_nums'], res_names=data['res_names'], spin_nums=None, 
spin_names=data['atom_names'], gen_seq=True)