r19376 - /branches/relax_disp/specific_analyses/relax_disp.py -- April 04, 2013 - 22:32

Author: bugman
Date: Thu Apr  4 22:32:50 2013
New Revision: 19376

URL: http://svn.gna.org/viewcvs/relax?rev=19376&view=rev
Log:
Fixes for the dispersion specific _assemble_param_vector() method.

The R2eff and I0 spin dictionary structures are now checked for their keys 
before pulling the value
out.


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19376&r1=19375&r2=19376&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Thu Apr  4 22:32:50 
2013
@@ -110,7 +110,7 @@
                     if spin.params[i] == 'R2eff':
                         if sim_index != None:
                             
param_vector.append(spin.r2eff_sim[key][sim_index])
-                        elif spin.r2eff == None:
+                        elif spin.r2eff == None or key not in spin.r2eff:
                             param_vector.append(0.0)
                         else:
                             param_vector.append(spin.r2eff[key])
@@ -119,7 +119,7 @@
                     elif spin.params[i] == 'I0':
                         if sim_index != None:
                             param_vector.append(spin.i0_sim[key][sim_index])
-                        elif spin.i0 == None:
+                        elif spin.i0 == None or key not in spin.i0:
                             param_vector.append(0.0)
                         else:
                             param_vector.append(spin.i0[key])