Author: tlinnet
Date: Wed Aug 20 19:33:41 2014
New Revision: 25117
URL: http://svn.gna.org/viewcvs/relax?rev=25117&view=rev
Log:
Modified that 'NS CPMG 2-site expanded' will be preferred before 'NS CPMG
2-site 3D' and 'NS CPMG 2-site star'.
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=25117&r1=25116&r2=25117&view=diff
==============================================================================
--- trunk/docs/latex/dispersion.tex (original)
+++ trunk/docs/latex/dispersion.tex Wed Aug 20 19:33:41 2014
@@ -1762,21 +1762,21 @@
\cline{1-1}
LM63 & - \\
LM63 3-site & LM63 \\
-CR72 & NS CPMG 2-site 3D, NS CPMG 2-site star,
NS CPMG 2-site expanded, B14 \\
-CR72 full & NS CPMG 2-site 3D full, NS CPMG 2-site
star full, B14 full, NS CPMG 2-site 3D, \\
- & NS CPMG 2-site star, NS CPMG 2-site
expanded, B14, CR72 \\
+CR72 & NS CPMG 2-site expanded, NS CPMG 2-site
3D, NS CPMG 2-site star, B14 \\
+CR72 full & NS CPMG 2-site 3D full, NS CPMG 2-site
star full, B14 full, NS CPMG 2-site expanded, \\
+ & NS CPMG 2-site 3D, NS CPMG 2-site star,
B14, CR72 \\
IT99 & - \\
TSMFK01 & - \\
-B14 & NS CPMG 2-site 3D, NS CPMG 2-site star,
NS CPMG 2-site expanded, CR72 \\
-B14 full & NS CPMG 2-site 3D full, NS CPMG 2-site
star full, CR72 full, NS CPMG 2-site 3D, \\
- & NS CPMG 2-site star, NS CPMG 2-site
expanded, B14, CR72 \\
+B14 & NS CPMG 2-site expanded, NS CPMG 2-site
3D, NS CPMG 2-site star, CR72 \\
+B14 full & NS CPMG 2-site 3D full, NS CPMG 2-site
star full, CR72 full, NS CPMG 2-site expanded, \\
+ & NS CPMG 2-site 3D, NS CPMG 2-site star,
B14, CR72 \\
NS CPMG 2-site expanded & NS CPMG 2-site 3D, NS CPMG 2-site star,
B14, CR72 \\
-NS CPMG 2-site 3D & NS CPMG 2-site star, NS CPMG 2-site
expanded, B14, CR72 \\
-NS CPMG 2-site 3D full & NS CPMG 2-site star full, B14 full, CR72
full, NS CPMG 2-site 3D, NS CPMG 2-site star, \\
- & NS CPMG 2-site expanded, B14, CR72 \\
-NS CPMG 2-site star & NS CPMG 2-site 3D, NS CPMG 2-site
expanded, B14, CR722 \\
-NS CPMG 2-site star full & NS CPMG 2-site 3D full, B14 full, CR72
full, NS CPMG 2-site 3D, NS CPMG 2-site star, \\
- & NS CPMG 2-site expanded, B14, CR72 \\
+NS CPMG 2-site 3D & NS CPMG 2-site expanded, NS CPMG 2-site
star, B14, CR72 \\
+NS CPMG 2-site 3D full & NS CPMG 2-site star full, B14 full, CR72
full, NS CPMG 2-site expanded, NS CPMG 2-site 3D, \\
+ & NS CPMG 2-site star, B14, CR72 \\
+NS CPMG 2-site star & NS CPMG 2-site expanded, NS CPMG 2-site
3D, B14, CR722 \\
+NS CPMG 2-site star full & NS CPMG 2-site 3D full, B14 full, CR72
full, NS CPMG 2-site expanded, NS CPMG 2-site 3D, \\
+ & NS CPMG 2-site star, B14, CR72 \\
% SQ, ZQ, DQ and MQ CPMG-type models.
\\[-5pt]
Modified: trunk/specific_analyses/relax_disp/variables.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=25117&r1=25116&r2=25117&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py (original)
+++ trunk/specific_analyses/relax_disp/variables.py Wed Aug 20 19:33:41
2014
@@ -499,7 +499,7 @@
# Define recurring lists.
## For CPMG.
-MODEL_NEST_LIST_CPMG = [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_STAR,
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_B14, MODEL_CR72]
+MODEL_NEST_LIST_CPMG = [MODEL_NS_CPMG_2SITE_EXPANDED,
MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_STAR, MODEL_B14, MODEL_CR72]
MODEL_NEST_LIST_CPMG_R20B = [MODEL_NS_CPMG_2SITE_3D_FULL,
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_B14_FULL, MODEL_CR72_FULL]
## For R1rho.
MODEL_NEST_LIST_R1RHO_2SITE = [MODEL_MP05, MODEL_TAP03, MODEL_TP02]
r25117 - in /trunk: docs/latex/dispersion.tex specific_analyses/relax_disp/variables.py