r8939 - /branches/bmrb/generic_fns/relax_data.py -- March 09, 2009 - 11:45

Author: bugman
Date: Mon Mar  9 11:44:59 2009
New Revision: 8939

URL: http://svn.gna.org/viewcvs/relax?rev=8939&view=rev
Log:
bmrb_read() now tries to read all relaxation data (from R2, R1, and NOE).


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=8939&r1=8938&r2=8939&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Mon Mar  9 11:44:59 2009
@@ -212,18 +212,24 @@
     @type star:     NMR_STAR instance
     """
 
-    # Get the R1 relaxation data.
-    for frq, res_nums, res_names, spin_names, val, err in 
star.heteronucl_T1_relaxation.loop():
-        # Create the labels.
-        ri_label = 'R1'
-        frq_label = str(int(frq*1e-6))
-
-        # Test if relaxation data corresponding to 'ri_label' and 
'frq_label' already exists.
-        if test_labels(ri_label, frq_label):
-            raise RelaxRiError, (ri_label, frq_label)
-
-        # Pack the data.
-        pack_data(ri_label, frq_label, frq, val, err, mol_names=None, 
res_nums=res_nums, res_names=res_names, spin_nums=None, 
spin_names=spin_names, gen_seq=True)
+    # 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():
+            # Create the labels.
+            ri_label = labels[i]
+            frq_label = str(int(frq*1e-6))
+
+            # Test if relaxation data corresponding to 'ri_label' and 
'frq_label' already exists.
+            if test_labels(ri_label, frq_label):
+                raise RelaxRiError, (ri_label, frq_label)
+
+            # Pack the data.
+            pack_data(ri_label, frq_label, frq, val, err, mol_names=None, 
res_nums=res_nums, res_names=res_names, spin_nums=None, 
spin_names=spin_names, gen_seq=True)