r9677 - /branches/bmrb/generic_fns/relax_data.py -- October 08, 2009 - 19:05

Author: bugman
Date: Thu Oct  8 19:05:03 2009
New Revision: 9677

URL: http://svn.gna.org/viewcvs/relax?rev=9677&view=rev
Log:
Removed a useless, now abstracted loop over the relaxation data types from 
bmrb_read().


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=9677&r1=9676&r2=9677&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Thu Oct  8 19:05:03 2009
@@ -207,20 +207,18 @@
     @type star:     NMR_STAR instance
     """
 
-    # Loop over the data types.
-    for i in range(3):
-        # Get the relaxation data.
-        for data_type, frq, res_nums, res_names, spin_names, val, err in 
star.relaxation.loop():
-            # Create the labels.
-            ri_label = data_type
-            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)
+    # Get the relaxation data.
+    for data_type, frq, res_nums, res_names, spin_names, val, err in 
star.relaxation.loop():
+        # Create the labels.
+        ri_label = data_type
+        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)