r21715 - /trunk/specific_analyses/relax_disp/api.py -- November 29, 2013 - 12:05

Author: bugman
Date: Fri Nov 29 12:05:33 2013
New Revision: 21715

URL: http://svn.gna.org/viewcvs/relax?rev=21715&view=rev
Log:
Fix for bug #21309, the 'R2eff' dispersion model failure when peak intensity 
data is missing.

The bug is reported at https://gna.org/bugs/?21309.

The problem was that the check for missing data in the _calculate_r2eff() 
private API method was
accidentally deleted in r21505 in the relax_disp branch.  See the commit at
http://article.gmane.org/gmane.science.nmr.relax.scm/19261 and the accidental 
deletion at
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?view=diff&r1=21504&r2=21505&pathrev=21505.


Modified:
    trunk/specific_analyses/relax_disp/api.py

Modified: trunk/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/api.py?rev=21715&r1=21714&r2=21715&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/api.py (original)
+++ trunk/specific_analyses/relax_disp/api.py Fri Nov 29 12:05:33 2013
@@ -194,6 +194,17 @@
                 int_keys = find_intensity_keys(exp_type=exp_type, frq=frq, 
point=point, time=time)
                 param_key = return_param_key_from_data(exp_type=exp_type, 
frq=frq, point=point)
 
+                # Check for missing data.
+                missing = False
+                for i in range(len(ref_keys)):
+                    if ref_keys[i] not in spin.intensities:
+                        missing = True
+                for i in range(len(int_keys)):
+                    if int_keys[i] not in spin.intensities:
+                        missing = True
+                if missing:
+                    continue
+
                 # Average the reference intensity data and errors.
                 ref_intensity = average_intensity(spin=spin, 
exp_type=exp_type, frq=frq, point=None, time=time)
                 ref_intensity_err = average_intensity(spin=spin, 
exp_type=exp_type, frq=frq, point=None, time=time, error=True)