r12651 - /branches/relax_data/generic_fns/relax_data.py -- March 01, 2011 - 17:19

Author: bugman
Date: Tue Mar  1 17:19:26 2011
New Revision: 12651

URL: http://svn.gna.org/viewcvs/relax?rev=12651&view=rev
Log:
Simplification of the return_value() function.


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=12651&r1=12650&r2=12651&view=diff
==============================================================================
--- branches/relax_data/generic_fns/relax_data.py (original)
+++ branches/relax_data/generic_fns/relax_data.py Tue Mar  1 17:19:26 2011
@@ -997,27 +997,12 @@
 
     @param spin:        The spin container.
     @type spin:         SpinContainer instance
-    @param data_type:   A tuple of the Ri label and the frequency label.
-    @type data_type:    tuple of str of length 2
-    """
-
-    # Unpack the data_type tuple.
-    ri_label, frq_label = data_type
-
-    # Initialise.
-    value = None
-    error = None
-
-    # Find the index corresponding to 'ri_label' and 'frq_label'.
-    index = find_ri_index(spin, ri_label, frq_label)
-
-    # Get the data.
-    if index != None:
-        value = spin.relax_data[index]
-        error = spin.relax_error[index]
+    @param data_type:   The relaxation data ID string.
+    @type data_type:    str
+    """
 
     # Return the data.
-    return value, error
+    return spin.ri_data[data_type], spin.ri_data_err[data_type]
 
 
 def temp_calibration(ri_label=None, frq_label=None, method=None):