r25499 - /trunk/specific_analyses/relax_disp/parameters.py -- September 01, 2014 - 14:33

Author: bugman
Date: Mon Sep  1 14:33:25 2014
New Revision: 25499

URL: http://svn.gna.org/viewcvs/relax?rev=25499&view=rev
Log:
Modified specific_analyses.relax_disp.parameters.r1_setup() to initialise the 
'r1' variable.

This relates to bug 22541 (https://gna.org/bugs/?22541), the R1 fit flag does 
not work in the GUI.

This is a hack, as all of the dispersion analysis code assumes that all 
parameters are initialised.
This is a dangerous assumption that will have to be eliminated in the future.


Modified:
    trunk/specific_analyses/relax_disp/parameters.py

Modified: trunk/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/parameters.py?rev=25499&r1=25498&r2=25499&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/parameters.py    (original)
+++ trunk/specific_analyses/relax_disp/parameters.py    Mon Sep  1 14:33:25 
2014
@@ -940,9 +940,11 @@
         # Should R1 data be optimised?
         r1_fit = is_r1_optimised(spin.model)
 
-        # Prepend R1.
+        # Prepend R1 and add it to the spin container.
         if r1_fit and 'r1' not in spin.params:
             spin.params.insert(0, 'r1')
+        if r1_fit and not hasattr(spin, 'r1'):
+            spin.r1 = {}
 
         # Remove the R1 parameter.
         if not r1_fit and 'r1' in spin.params: