r25432 - /trunk/specific_analyses/relax_disp/data.py -- August 29, 2014 - 14:57

Author: bugman
Date: Fri Aug 29 14:57:38 2014
New Revision: 25432

URL: http://svn.gna.org/viewcvs/relax?rev=25432&view=rev
Log:
Better error checking for the 
specific_analyses.relax_disp.average_intensity() function.

This function would fail with a traceback if a peak intensity error analysis 
had not yet been
performed.  Now it fails instead with a clean RelaxError so that the user 
knows what is wrong.


Modified:
    trunk/specific_analyses/relax_disp/data.py

Modified: trunk/specific_analyses/relax_disp/data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/data.py?rev=25432&r1=25431&r2=25432&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/data.py  (original)
+++ trunk/specific_analyses/relax_disp/data.py  Fri Aug 29 14:57:38 2014
@@ -149,7 +149,7 @@
         # Error intensity data.
         if error:
             # Error checking.
-            if not int_keys[i] in spin.peak_intensity_err:
+            if not hasattr(spin, 'peak_intensity_err') or not int_keys[i] in 
spin.peak_intensity_err:
                 raise RelaxError("The peak intensity errors are missing the 
key '%s'." % int_keys[i])
 
             # Sum.