r22864 - /trunk/specific_analyses/relax_disp/optimisation.py -- April 28, 2014 - 16:09

Author: tlinnet
Date: Mon Apr 28 16:09:19 2014
New Revision: 22864

URL: http://svn.gna.org/viewcvs/relax?rev=22864&view=rev
Log:
Fix for non-existing dict Keys getting errors.

Feature request: #3151, (https://gna.org/support/index.php?3151) - User 
function to set the R20 parameters in the default grid search using the 
minimum R2eff value.

Modified:
    trunk/specific_analyses/relax_disp/optimisation.py

Modified: trunk/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/optimisation.py?rev=22864&r1=22863&r2=22864&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/optimisation.py  (original)
+++ trunk/specific_analyses/relax_disp/optimisation.py  Mon Apr 28 16:09:19 
2014
@@ -397,15 +397,22 @@
 
             # Test if the value is a dict, for example for r2.
             if type(val) == dict:
-                    val_dic = val[r20_key]
-                    if is_float(val_dic) and val_dic != 0.0:
-                        # Printout.
-                        print("The spin '%s' parameter %s '%s[%i]' is 
pre-set to %s, skipping it in the grid search." % (spin_ids[si], r20_key, 
param_name, param_index, val_dic))
-
-                        # Turn of the grid search for this parameter.
-                        inc[param_index] = 1
-                        lower[param_index] = val_dic
-                        upper[param_index] = val_dic
+                    # Test if r20_key exists.
+                    if r20_key != None:
+                        try:
+                            val_dic = val[r20_key]
+                        except KeyError:
+                            print("The key:%s does not exist"%r20_key)
+                            continue
+
+                        if is_float(val_dic) and val_dic != 0.0:
+                            # Printout.
+                            print("The spin '%s' parameter %s '%s[%i]' is 
pre-set to %s, skipping it in the grid search." % (spin_ids[si], r20_key, 
param_name, param_index, val_dic))
+
+                            # Turn of the grid search for this parameter.
+                            inc[param_index] = 1
+                            lower[param_index] = val_dic
+                            upper[param_index] = val_dic
 
     # The full grid size.
     grid_size = 1