r25119 - in /trunk: docs/latex/dispersion.tex specific_analyses/relax_disp/variables.py -- August 20, 2014 - 19:47

Author: tlinnet
Date: Wed Aug 20 19:47:51 2014
New Revision: 25119

URL: http://svn.gna.org/viewcvs/relax?rev=25119&view=rev
Log:
Modified the nesting for 'NS MMQ 3-site linear'.

'NS MMQ 3-site linear' should be able to nest from 'NS MMQ 3-site'.

Modified:
    trunk/docs/latex/dispersion.tex
    trunk/specific_analyses/relax_disp/variables.py

Modified: trunk/docs/latex/dispersion.tex
URL: 
http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion.tex?rev=25119&r1=25118&r2=25119&view=diff
==============================================================================
--- trunk/docs/latex/dispersion.tex     (original)
+++ trunk/docs/latex/dispersion.tex     Wed Aug 20 19:47:51 2014
@@ -1784,7 +1784,7 @@
 \cline{1-1}
 MMQ CR72                         & NS MMQ 2-site \\
 NS MMQ 2-site                    & MMQ CR72 \\
-NS MMQ 3-site linear             & NS MMQ 2-site, MMQ CR72 \\
+NS MMQ 3-site linear             & NS MMQ 3-site, NS MMQ 2-site, MMQ CR72 \\
 NS MMQ 3-site                    & NS MMQ 3-site linear, NS MMQ 2-site, MMQ 
CR72 \\
 
 % R1rho-type models.

Modified: trunk/specific_analyses/relax_disp/variables.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=25119&r1=25118&r2=25119&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py     (original)
+++ trunk/specific_analyses/relax_disp/variables.py     Wed Aug 20 19:47:51 
2014
@@ -507,7 +507,7 @@
 MODEL_NEST_LIST_R1RHO_3SITE = [MODEL_NS_R1RHO_3SITE_LINEAR, 
MODEL_NS_R1RHO_2SITE]
 ## For CPMG MMQ.
 MODEL_NEST_LIST_MMQ_2SITE = [MODEL_NS_MMQ_2SITE, MODEL_MMQ_CR72]
-MODEL_NEST_LIST_MMQ_3SITE = [MODEL_NS_MMQ_3SITE_LINEAR]
+MODEL_NEST_LIST_MMQ_3SITE = [MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
 
 # Define order of nesting models for each model.
 MODEL_NEST_R2EFF = None
@@ -544,7 +544,7 @@
 MODEL_NEST_MMQ_CR72 = MODEL_NEST_LIST_MMQ_2SITE
 MODEL_NEST_NS_MMQ_2SITE = MODEL_NEST_LIST_MMQ_2SITE
 MODEL_NEST_NS_MMQ_3SITE = MODEL_NEST_LIST_MMQ_3SITE + 
MODEL_NEST_LIST_MMQ_2SITE
-MODEL_NEST_NS_MMQ_3SITE_LINEAR = MODEL_NEST_LIST_MMQ_2SITE
+MODEL_NEST_NS_MMQ_3SITE_LINEAR = MODEL_NEST_LIST_MMQ_3SITE + 
MODEL_NEST_LIST_MMQ_2SITE
 
 
 # Full model description list.