r25463 - /trunk/specific_analyses/relax_disp/uf.py -- August 30, 2014 - 00:00

Author: tlinnet
Date: Sat Aug 30 00:00:45 2014
New Revision: 25463

URL: http://svn.gna.org/viewcvs/relax?rev=25463&view=rev
Log:
Fix for 'r1' not being added to parameters, when looking up model in 
dictionary.

bug #22541(https://gna.org/bugs/?22541): The R1 fit flag does not work in the 
GUI.

Modified:
    trunk/specific_analyses/relax_disp/uf.py

Modified: trunk/specific_analyses/relax_disp/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/uf.py?rev=25463&r1=25462&r2=25463&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/uf.py    (original)
+++ trunk/specific_analyses/relax_disp/uf.py    Sat Aug 30 00:00:45 2014
@@ -169,8 +169,19 @@
 
     # All other models.
     else:
-        params = MODEL_PARAMS[model]
+        # Should r1 parameter be added to params?
+        add_r1 = False
 
+        # Check if r1_fit is stored in cdp.
+        if hasattr(cdp, 'r1_fit'):
+            if cdp.r1_fit:
+                if 'r1' not in MODEL_PARAMS[model]:
+                    add_r1 = True
+        if add_r1:
+            params = ['r1'] + MODEL_PARAMS[model]
+        else:
+            params = MODEL_PARAMS[model]
+    
     # Printout.
     print(MODEL_DESC[model])