r19896 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- June 06, 2013 - 17:36

Author: bugman
Date: Thu Jun  6 17:36:43 2013
New Revision: 19896

URL: http://svn.gna.org/viewcvs/relax?rev=19896&view=rev
Log:
Added some error checking to the 
specific_analyses.relax_disp.disp_data.average_intensity() function.

This is for better feedback to the user in case they have not set up their 
data correctly.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=19896&r1=19895&r2=19896&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Thu Jun  6 
17:36:43 2013
@@ -76,14 +76,29 @@
     for i in range(len(int_keys)):
         # Simulation intensity data.
         if sim_index != None:
+            # Error checking.
+            if not int_keys[i] in spin.intensity_sim:
+                raise RelaxError("The peak intensity simulation data is 
missing the key '%s'." % int_keys[i])
+
+            # Sum.
             intensity += spin.intensity_sim[int_keys[i]][sim_index]
 
         # Error intensity data.
         elif error:
+            # Error checking.
+            if not int_keys[i] in spin.intensity_err:
+                raise RelaxError("The peak intensity errors are missing the 
key '%s'." % int_keys[i])
+
+            # Sum.
             intensity += spin.intensity_err[int_keys[i]]**2
 
         # Normal intensity data.
         elif not error:
+            # Error checking.
+            if not int_keys[i] in spin.intensities:
+                raise RelaxError("The peak intensity data is missing the key 
'%s'." % int_keys[i])
+
+            # Sum.
             intensity += spin.intensities[int_keys[i]]
 
     # Average.