r12720 - /branches/relax_data/generic_fns/relax_data.py -- March 02, 2011 - 15:33

Author: bugman
Date: Wed Mar  2 15:33:19 2011
New Revision: 12720

URL: http://svn.gna.org/viewcvs/relax?rev=12720&view=rev
Log:
The relax_data return_value() function can now handle missing data.


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=12720&r1=12719&r2=12720&view=diff
==============================================================================
--- branches/relax_data/generic_fns/relax_data.py (original)
+++ branches/relax_data/generic_fns/relax_data.py Wed Mar  2 15:33:19 2011
@@ -730,8 +730,18 @@
     @type data_type:    str
     """
 
+    # Relaxation data.
+    data = None
+    if hasattr(spin, 'ri_data') and spin.ri_data != None and data_type in 
spin.ri_data.keys():
+        data = spin.ri_data[data_type]
+
+    # Relaxation errors.
+    error = None
+    if hasattr(spin, 'ri_data_err') and spin.ri_data_err != None and 
data_type in spin.ri_data_err.keys():
+        error = spin.ri_data_err[data_type]
+
     # Return the data.
-    return spin.ri_data[data_type], spin.ri_data_err[data_type]
+    return data, error
 
 
 def temp_calibration(ri_id=None, method=None):