r9675 - /branches/bmrb/generic_fns/relax_data.py -- October 08, 2009 - 19:02

Author: bugman
Date: Thu Oct  8 19:02:25 2009
New Revision: 9675

URL: http://svn.gna.org/viewcvs/relax?rev=9675&view=rev
Log:
Changes to generic_fns.relax_data.bmrb_read() for an abstracted bmrblib API.

This part of the API doesn't exist yet.


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=9675&r1=9674&r2=9675&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Thu Oct  8 19:02:25 2009
@@ -207,16 +207,12 @@
     @type star:     NMR_STAR instance
     """
 
-    # R1, R2, and NOE.
-    labels = ['R1', 'R2', 'NOE']
-    objects = [star.heteronucl_T1_relaxation, star.heteronucl_T2_relaxation, 
star.heteronucl_NOEs]
-
     # Loop over the data types.
     for i in range(3):
         # Get the relaxation data.
-        for frq, res_nums, res_names, spin_names, val, err in 
objects[i].loop():
+        for data_type, frq, res_nums, res_names, spin_names, val, err in 
star.relaxation_data.loop():
             # Create the labels.
-            ri_label = labels[i]
+            ri_label = data_type
             frq_label = str(int(frq*1e-6))
 
             # Test if relaxation data corresponding to 'ri_label' and 
'frq_label' already exists.