r20365 - /branches/relax_disp/user_functions/relax_disp.py -- July 17, 2013 - 17:18

Author: bugman
Date: Wed Jul 17 17:18:28 2013
New Revision: 20365

URL: http://svn.gna.org/viewcvs/relax?rev=20365&view=rev
Log:
Fix for the relax_disp.select_model user function for the 'NS 2-site 
expanded' model.

There is only one R20 parameter as R20A = R20B in this model.


Modified:
    branches/relax_disp/user_functions/relax_disp.py

Modified: branches/relax_disp/user_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=20365&r1=20364&r2=20365&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Wed Jul 17 17:18:28 2013
@@ -447,7 +447,7 @@
         "%s: {R20A, R20B, ..., pA, dw, kex}" % MODEL_NS_2SITE_3D,
         "%s: {R20, ..., pA, dw, kex}" % MODEL_NS_2SITE_STAR_RED,
         "%s: {R20A, R20B, ..., pA, dw, kex}" % MODEL_NS_2SITE_STAR,
-        "%s: {R20A, R20B, ..., pA, dw, kex}" % MODEL_NS_2SITE_EXPANDED,
+        "%s: {R20, ..., pA, dw, kex}" % MODEL_NS_2SITE_EXPANDED,
         "%s: {R1rho', ..., phi_ex, kex}" % MODEL_M61,
         "%s: {R1rho', ..., phi_ex, kex}" % MODEL_DPL94,
         "%s: {R1rho', ..., pA, dw, kex}" % MODEL_M61B
@@ -498,7 +498,7 @@
 uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_2SITE_3D, "The numerical 
solution for the 2-site Bloch-McConnell equations using 3D magnetisation 
vectors.  Its parameters are {R20A, R20B, ..., pA, dw, kex}.")
 uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_2SITE_STAR_RED, "The 
numerical solution for the 2-site Bloch-McConnell equations using complex 
conjugate matrices whereby the simplification R20A = R20B is assumed.  It has 
the parameters {R20, ..., pA, dw, kex}.")
 uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_2SITE_STAR, "The 
numerical solution for the 2-site Bloch-McConnell equations using complex 
conjugate matrices with parameters {R20A, R20B, ..., pA, dw, kex}.")
-uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_2SITE_EXPANDED, "The 
numerical solution for the 2-site Bloch-McConnell equationsexpanded using 
Maple by Nikolai Skrynnikov.  It has the parameters {R20A, R20B, ..., pA, dw, 
kex}.")
+uf.desc[-1].add_item_list_element("'%s'" % MODEL_NS_2SITE_EXPANDED, "The 
numerical solution for the 2-site Bloch-McConnell equationsexpanded using 
Maple by Nikolai Skrynnikov.  It has the parameters {R20, ..., pA, dw, kex}.")
 uf.desc[-1].add_paragraph("For the R1rho-type experiment, only the base 
models are currently supported:")
 uf.desc[-1].add_item_list_element("'%s'" % MODEL_R2EFF, "This is the same 
model model as for the CPMG-type experiments except that the R1rho and not 
R2eff values are determined.")
 uf.desc[-1].add_item_list_element("'%s'" % MODEL_NOREX, "This is the model 
for no chemical exchange being present,")