r18727 - in /branches/frame_order_testing: ./ specific_fns/api_common.py -- March 09, 2013 - 11:46

Author: bugman
Date: Sat Mar  9 11:46:57 2013
New Revision: 18727

URL: http://svn.gna.org/viewcvs/relax?rev=18727&view=rev
Log:
Merged revisions 18726 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18726 | bugman | 2013-03-09 11:38:38 +0100 (Sat, 09 Mar 2013) | 9 lines
  
  Fix for bug #20563 (https://gna.org/bugs/?20563), the end failure of the 
model-free auto-analysis.
  
  This was reported by Stanislava Panova (https://gna.org/users/stacy).  The 
problem was related to
  the Monte Carlo simulations.  The generic_fns.monte_carlo.create_data() 
function is now asking for
  the errors associated with a certain data point, even if that data point 
does not exist.  The
  solution was to check if the relaxation data ID string is present in 
spin.ri_data_err before
  accessing the key-value pair (in the specific API 
_return_error_relax_data() common method).
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/specific_fns/api_common.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Mar  9 11:46:57 2013
@@ -1,1 +1,1 @@
-/trunk:1-18724
+/trunk:1-18726

Modified: branches/frame_order_testing/specific_fns/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/api_common.py?rev=18727&r1=18726&r2=18727&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/api_common.py (original)
+++ branches/frame_order_testing/specific_fns/api_common.py Sat Mar  9 
11:46:57 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2004-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2004-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -257,7 +257,13 @@
         # Convert to a list.
         error = []
         for ri_id in cdp.ri_ids:
-            error.append(spin.ri_data_err[ri_id])
+            # Handle missing data/errors.
+            if ri_id not in spin.ri_data_err:
+                error.append(None)
+
+            # Append the value.
+            else:
+                error.append(spin.ri_data_err[ri_id])
 
         # Return the list.
         return error