r21022 - /branches/relax_disp/specific_analyses/relax_disp/disp_data.py -- October 09, 2013 - 17:00

Author: bugman
Date: Wed Oct  9 17:00:42 2013
New Revision: 21022

URL: http://svn.gna.org/viewcvs/relax?rev=21022&view=rev
Log:
Bug fixes for the averaging of peak intensity errors in the dispersion 
analysis.

This is in the specific_analysis.relax_disp.disp_data.average_intensity() 
function.


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=21022&r1=21021&r2=21022&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Wed Oct  9 
17:00:42 2013
@@ -95,7 +95,7 @@
             intensity += spin.intensity_sim[int_keys[i]][sim_index]
 
         # Error intensity data.
-        elif error:
+        if 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])
@@ -104,7 +104,7 @@
             intensity += spin.intensity_err[int_keys[i]]**2
 
         # Normal intensity data.
-        elif not error:
+        else:
             # Error checking.
             if not int_keys[i] in spin.intensities:
                 raise RelaxError("The peak intensity data is missing the key 
'%s'." % int_keys[i])
@@ -114,7 +114,7 @@
 
     # Average.
     if error:
-        intensity = sqrt(intensity) / len(int_keys)
+        intensity = sqrt(intensity / len(int_keys))
     else:
         intensity /= len(int_keys)