r18329 - /trunk/specific_fns/model_free/mf_minimise.py -- February 01, 2013 - 11:22

Author: bugman
Date: Fri Feb  1 11:22:16 2013
New Revision: 18329

URL: http://svn.gna.org/viewcvs/relax?rev=18329&view=rev
Log:
Fix for bug #20464 (https://gna.org/bugs/?20464).

The problem was the previously missing data had a value of None whereas now 
the dictionary element
can be missing.  Checks have been added to make sure the spin specific 
relaxation data structures
have the key corresponding to the data.


Modified:
    trunk/specific_fns/model_free/mf_minimise.py

Modified: trunk/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/model_free/mf_minimise.py?rev=18329&r1=18328&r2=18329&view=diff
==============================================================================
--- trunk/specific_fns/model_free/mf_minimise.py (original)
+++ trunk/specific_fns/model_free/mf_minimise.py Fri Feb  1 11:22:16 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -1083,6 +1083,10 @@
 
             # Make sure that the errors are strictly positive numbers.
             for ri_id in cdp.ri_ids:
+                # Skip missing data.
+                if not ri_id in spin.ri_data_err:
+                    continue
+
                 # Alias.
                 err = spin.ri_data_err[ri_id]
 
@@ -1213,6 +1217,10 @@
 
         # Loop over the relaxation data.
         for ri_id in cdp.ri_ids:
+            # Skip missing data.
+            if ri_id not in spin.ri_data:
+                continue
+
             # The Rx data.
             if sim_index == None:
                 data = spin.ri_data[ri_id]