Re: r22899 - /trunk/specific_analyses/relax_disp/variables.py -- May 02, 2014 - 09:07

Hi,

Again the ordering by date could be used here to match all the other models.

Cheers,

Edward



On 1 May 2014 09:17,  <tlinnet@xxxxxxxxxxxxx> wrote:
> Author: tlinnet
> Date: Thu May  1 09:17:05 2014
> New Revision: 22899
>
> URL: http://svn.gna.org/viewcvs/relax?rev=22899&view=rev
> Log:
> Further added info for MODEL_B14 to specific_analyses.relax_disp.variables.
>
> sr #3154: (https://gna.org/support/?3154) Implementation of Baldwin (2014) 
> B14 model - 2-site exact solution model for all time scales.
>
> 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=22899&r1=22898&r2=22899&view=diff
> ==============================================================================
> --- trunk/specific_analyses/relax_disp/variables.py     (original)
> +++ trunk/specific_analyses/relax_disp/variables.py     Thu May  1 09:17:05 
> 2014
> @@ -175,16 +175,16 @@
>
>
>  # The model lists.
> -MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
> MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_M61, MODEL_M61B, 
> MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, MODEL_NS_CPMG_2SITE_3D, 
> MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR, 
> MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
> MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, 
> MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
> MODEL_NS_MMQ_3SITE_LINEAR]
> +MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_B14, 
> MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_M61, 
> MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, 
> MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
> MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, 
> MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
>  """The list of all dispersion models (excluding the R2eff model)."""
>
> -MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, 
> MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_M61, 
> MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, 
> MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
> MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, 
> MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
> +MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, 
> MODEL_B14, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, 
> MODEL_M61, MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MP05, 
> MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
> MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, 
> MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR]
>  """The list of the R2eff model together with all dispersion models."""
>
> -MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
> MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_NS_CPMG_2SITE_3D, 
> MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR, 
> MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_CPMG_2SITE_EXPANDED]
> +MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_B14, 
> MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, 
> MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED]
>  """The list of all dispersion models specifically for CPMG-type 
> experiments (excluding the R2eff model)."""
>
> -MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
> MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, 
> MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED]
> +MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
> MODEL_LM63_3SITE, MODEL_B14, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, 
> MODEL_TSMFK01, MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED]
>  """The list of the R2eff model together with all dispersion models 
> specifically for CPMG-type experiments."""
>
>  MODEL_LIST_R1RHO = [MODEL_NOREX, MODEL_M61, MODEL_M61B, MODEL_DPL94, 
> MODEL_TP02, MODEL_TAP03, MODEL_MP05, MODEL_NS_R1RHO_2SITE, 
> MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR]
> @@ -202,7 +202,7 @@
>  MODEL_LIST_MMQ = [MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
> MODEL_NS_MMQ_3SITE_LINEAR]
>  """The list of all dispersion models specifically for MMQ CPMG-type 
> experiments."""
>
> -MODEL_LIST_ANALYTIC = [MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, 
> MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_M61, MODEL_M61B, 
> MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MMQ_CR72, MODEL_MP05]
> +MODEL_LIST_ANALYTIC = [MODEL_LM63, MODEL_LM63_3SITE, MODEL_B14, 
> MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_M61, 
> MODEL_M61B, MODEL_DPL94, MODEL_TP02, MODEL_TAP03, MODEL_MMQ_CR72, 
> MODEL_MP05]
>  """The list of all analytic models."""
>
>  MODEL_LIST_NUMERIC = [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
> MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
> MODEL_NS_MMQ_3SITE_LINEAR]
> @@ -217,6 +217,7 @@
>      MODEL_NOREX: MODEL_DESC_NOREX,
>      MODEL_LM63: MODEL_DESC_LM63,
>      MODEL_LM63_3SITE: MODEL_DESC_LM63_3SITE,
> +    MODEL_B14: MODEL_DESC_B14,
>      MODEL_CR72: MODEL_DESC_CR72,
>      MODEL_CR72_FULL: MODEL_DESC_CR72_FULL,
>      MODEL_IT99: MODEL_DESC_IT99,
> @@ -247,6 +248,7 @@
>      MODEL_NOREX: MODEL_PARAMS_NOREX,
>      MODEL_LM63: MODEL_PARAMS_LM63,
>      MODEL_LM63_3SITE: MODEL_PARAMS_LM63_3SITE,
> +    MODEL_B14: MODEL_PARAMS_B14,
>      MODEL_CR72: MODEL_PARAMS_CR72,
>      MODEL_CR72_FULL: MODEL_PARAMS_CR72_FULL,
>      MODEL_IT99: MODEL_PARAMS_IT99,
>
>
> _______________________________________________
> relax (http://www.nmr-relax.com)
>
> This is the relax-commits mailing list
> relax-commits@xxxxxxx
>
> To unsubscribe from this list, get a password
> reminder, or change your subscription options,
> visit the list information page at
> https://mail.gna.org/listinfo/relax-commits