r25126 - in /trunk: auto_analyses/relax_disp.py specific_analyses/relax_disp/model.py -- August 20, 2014 - 21:33

Author: tlinnet
Date: Wed Aug 20 21:33:26 2014
New Revision: 25126

URL: http://svn.gna.org/viewcvs/relax?rev=25126&view=rev
Log:
Fix for parameter conversion when model is:
MODEL_PARAMS_NS_R1RHO_3SITE or MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR.

Modified:
    trunk/auto_analyses/relax_disp.py
    trunk/specific_analyses/relax_disp/model.py

Modified: trunk/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/relax_disp.py?rev=25126&r1=25125&r2=25126&view=diff
==============================================================================
--- trunk/auto_analyses/relax_disp.py   (original)
+++ trunk/auto_analyses/relax_disp.py   Wed Aug 20 21:33:26 2014
@@ -375,6 +375,9 @@
                 if param_conv == '1 - pA':
                     val = 1.0 - getattr(nested_spin, 'pA')
 
+                elif param_conv == '0.0':
+                    val = 0.0
+
                 else:
                     val = deepcopy(getattr(nested_spin, param_conv))
 

Modified: trunk/specific_analyses/relax_disp/model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/model.py?rev=25126&r1=25125&r2=25126&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/model.py (original)
+++ trunk/specific_analyses/relax_disp/model.py Wed Aug 20 21:33:26 2014
@@ -316,6 +316,30 @@
             elif param == 'kC':
                 par_dic[param] = 'kex'
 
+    ## The 'MODEL_PARAMS_NS_R1RHO_3SITE' model parameters from 
'MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR'.
+    if set(model_params) == set(MODEL_PARAMS_NS_R1RHO_3SITE) and 
set(nested_model_params) == set(MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR):
+        for param in model_params:
+            if param == 'kex_AC':
+                par_dic[param] = '0.0'
+
+    ## The 'MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR' model parameters from R1RHO 
2SITE.
+    if set(model_params) == set(MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR) and 
set(nested_model_params) == set(MODEL_PARAMS_NS_R1RHO_2SITE):
+        for param in model_params:
+            if param == 'dw_AB':
+                par_dic[param] = 'dw'
+
+            elif param == 'kex_AB':
+                par_dic[param] = 'kex'
+
+            elif param == 'dw_BC':
+                par_dic[param] = 'dw'
+
+            elif param == 'kex_BC':
+                par_dic[param] = 'kex'
+
+            elif param == 'pB':
+                par_dic[param] = '1 - pA'
+
     ## The 'MODEL_PARAMS_NS_R1RHO_3SITE' model parameters from R1RHO 2SITE.
     if set(model_params) == set(MODEL_PARAMS_NS_R1RHO_3SITE) and 
set(nested_model_params) == set(MODEL_PARAMS_NS_R1RHO_2SITE):
         for param in model_params: