r25070 - /trunk/specific_analyses/relax_disp/variables.py -- August 19, 2014 - 13:31

Author: tlinnet
Date: Tue Aug 19 13:31:56 2014
New Revision: 25070

URL: http://svn.gna.org/viewcvs/relax?rev=25070&view=rev
Log:
Modified the defined list of nesting, according to thread:

http://thread.gmane.org/gmane.science.nmr.relax.devel/6684

More specific, thread:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6694

Modified:
    trunk/specific_analyses/relax_disp/variables.py

Modified: trunk/specific_analyses/relax_disp/variables.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/variables.py?rev=25070&r1=25069&r2=25070&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/variables.py     (original)
+++ trunk/specific_analyses/relax_disp/variables.py     Tue Aug 19 13:31:56 
2014
@@ -506,7 +506,7 @@
 MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1 = [MODEL_MP05_FIT_R1, MODEL_TAP03_FIT_R1, 
MODEL_TP02_FIT_R1]
 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_CR72]
+MODEL_NEST_LIST_MMQ_2SITE = [MODEL_NS_MMQ_2SITE, MODEL_MMQ_CR72]
 MODEL_NEST_LIST_MMQ_3SITE = [MODEL_NS_MMQ_3SITE_LINEAR]
 
 # Define order of nesting models for each model.
@@ -516,11 +516,11 @@
 MODEL_NEST_NOREX_R1RHO_FIT_R1 = None
 MODEL_NEST_LM63 = None
 MODEL_NEST_LM63_3SITE = [MODEL_LM63]
-MODEL_NEST_CR72 = MODEL_NEST_LIST_CPMG + MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_CR72 = MODEL_NEST_LIST_CPMG
 MODEL_NEST_CR72_FULL = MODEL_NEST_LIST_CPMG_R20B + MODEL_NEST_LIST_CPMG
 MODEL_NEST_IT99 = None
 MODEL_NEST_TSMFK01 = None
-MODEL_NEST_B14 = MODEL_NEST_LIST_CPMG + MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_B14 = MODEL_NEST_LIST_CPMG
 MODEL_NEST_B14_FULL = MODEL_NEST_LIST_CPMG_R20B + MODEL_NEST_LIST_CPMG
 MODEL_NEST_M61 = None
 MODEL_NEST_M61B = None
@@ -532,11 +532,11 @@
 MODEL_NEST_TAP03_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
 MODEL_NEST_MP05 = MODEL_NEST_LIST_R1RHO_2SITE
 MODEL_NEST_MP05_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
-MODEL_NEST_NS_CPMG_2SITE_3D = MODEL_NEST_LIST_CPMG + 
MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_NS_CPMG_2SITE_3D = MODEL_NEST_LIST_CPMG
 MODEL_NEST_NS_CPMG_2SITE_3D_FULL = MODEL_NEST_LIST_CPMG_R20B + 
MODEL_NEST_LIST_CPMG
-MODEL_NEST_NS_CPMG_2SITE_STAR = MODEL_NEST_LIST_CPMG + 
MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_NS_CPMG_2SITE_STAR = MODEL_NEST_LIST_CPMG
 MODEL_NEST_NS_CPMG_2SITE_STAR_FULL = MODEL_NEST_LIST_CPMG_R20B + 
MODEL_NEST_LIST_CPMG
-MODEL_NEST_NS_CPMG_2SITE_EXPANDED = MODEL_NEST_LIST_CPMG + 
MODEL_NEST_LIST_CPMG_R20B
+MODEL_NEST_NS_CPMG_2SITE_EXPANDED = MODEL_NEST_LIST_CPMG
 MODEL_NEST_NS_R1RHO_2SITE = MODEL_NEST_LIST_R1RHO_2SITE
 MODEL_NEST_NS_R1RHO_2SITE_FIT_R1 = MODEL_NEST_LIST_R1RHO_2SITE_FIT_R1
 MODEL_NEST_NS_R1RHO_3SITE = MODEL_NEST_LIST_R1RHO_3SITE + 
MODEL_NEST_LIST_R1RHO_2SITE