Re: r23023 - /trunk/gui/analyses/auto_relax_disp.py -- May 06, 2014 - 18:08

Hi Troels,

Weird, 'B14' and 'B14 full' parameters look like the are reversed in
the diff.  But this is only because the diff cannot work out which
line changed :)  The change is good.

Cheers,

Edward



On 6 May 2014 17:34,  <tlinnet@xxxxxxxxxxxxx> wrote:
> Author: tlinnet
> Date: Tue May  6 17:34:20 2014
> New Revision: 23023
>
> URL: http://svn.gna.org/viewcvs/relax?rev=23023&view=rev
> Log:
> Added B14 and B14_FULL to the relax GUI.
>
> sr #3154: (https://gna.org/support/?3154) Implementation of Baldwin (2014) 
> B14 model - 2-site exact solution model for all time scales.
>
> This follows the tutorial for adding relaxation dispersion models at:
> http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax#The_GUI
>
>
> Modified:
>     trunk/gui/analyses/auto_relax_disp.py
>
> Modified: trunk/gui/analyses/auto_relax_disp.py
> URL: 
> http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_relax_disp.py?rev=23023&r1=23022&r2=23023&view=diff
> ==============================================================================
> --- trunk/gui/analyses/auto_relax_disp.py       (original)
> +++ trunk/gui/analyses/auto_relax_disp.py       Tue May  6 17:34:20 2014
> @@ -48,7 +48,7 @@
>  from pipe_control.mol_res_spin import exists_mol_res_spin_data, spin_loop
>  from pipe_control.pipes import has_bundle, has_pipe
>  from specific_analyses.relax_disp.data import has_cpmg_exp_type, 
> has_r1rho_exp_type
> -from specific_analyses.relax_disp.variables import MODEL_CR72, 
> MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, MODEL_LIST_CPMG, 
> MODEL_LIST_R1RHO, MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, 
> MODEL_MMQ_CR72, MODEL_MP05, MODEL_NOREX, MODEL_NS_CPMG_2SITE_3D, 
> MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
> MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
> MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR, 
> MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, 
> MODEL_R2EFF, MODEL_TAP03, MODEL_TP02, MODEL_TSMFK01
> +from specific_analyses.relax_disp.variables import MODEL_B14, 
> MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, 
> MODEL_LIST_CPMG, MODEL_LIST_R1RHO, MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, 
> MODEL_M61B, MODEL_MMQ_CR72, MODEL_MP05, MODEL_NOREX, 
> MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
> MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_STAR, 
> MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE, 
> MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, MODEL_NS_R1RHO_3SITE, 
> MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_R2EFF, MODEL_TAP03, MODEL_TP02, 
> MODEL_TSMFK01
>  from status import Status; status = Status()
>
>
> @@ -722,6 +722,8 @@
>          MODEL_CR72_FULL,
>          MODEL_IT99,
>          MODEL_TSMFK01,
> +        MODEL_B14,
> +        MODEL_B14_FULL,
>          MODEL_NS_CPMG_2SITE_EXPANDED,
>          MODEL_NS_CPMG_2SITE_3D,
>          MODEL_NS_CPMG_2SITE_3D_FULL,
> @@ -755,6 +757,8 @@
>          "{%s, ..., %s, %s, %s}" % (r2, phi_ex, padw2, kex),
>          "{%s, ..., %s, k_AB}" % (r2a, dw),
>          "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
> +        "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
> +        "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
>          "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
>          "{%s, %s, ..., pA, %s, %s}" % (r2a, r2b, dw, kex),
>          "{%s, ..., pA, %s, %s}" % (r2, dw, kex),
> @@ -786,6 +790,8 @@
>          "The Carver and Richards (1972) 2-site equation for all time 
> scales.",
>          "The Ishima and Torchia (1999) 2-site model for all time scales 
> with pA >> pB.",
>          "The Tollinger et al. (2001) 2-site very-slow exchange model.",
> +        "The Baldwin (2014) 2-site exact solution model for all time 
> scales (with %s = %s)." % (r2a, r2b),
> +        "The Baldwin (2014) 2-site exact solution model for all time 
> scales.",
>          "The 2-site numerical solution expanded using Maple by Nikolai 
> Skrynnikov.",
>          "The 2-site numerical solution using 3D magnetisation vectors 
> (with %s = %s)." % (r2a, r2b),
>          "The 2-site numerical solution using 3D magnetisation vectors.",
>
>
> _______________________________________________
> 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