r21467 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- November 16, 2013 - 17:12

Author: bugman
Date: Sat Nov 16 17:12:47 2013
New Revision: 21467

URL: http://svn.gna.org/viewcvs/relax?rev=21467&view=rev
Log:
Added the 'MP05' model to the GUI model list.

This is the Miloushev and Palmer 2005 R1rho analytic model for 2-site 
off-resonance exchange.

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:
    branches/relax_disp/gui/analyses/auto_relax_disp.py

Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=21467&r1=21466&r2=21467&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Sat Nov 16 17:12:47 
2013
@@ -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.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_2SITE, 
MODEL_MQ_CR72, 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_R1RHO_2SITE, MODEL_R2EFF, MODEL_TP02, MODEL_TSMFK01
+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_2SITE, 
MODEL_MP05, MODEL_MQ_CR72, 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_R1RHO_2SITE, MODEL_R2EFF, MODEL_TP02, MODEL_TSMFK01
 from status import Status; status = Status()
 
 
@@ -128,7 +128,7 @@
                 MODEL_NOREX,
                 MODEL_CR72,
                 MODEL_NS_CPMG_2SITE_EXPANDED,
-                MODEL_TP02,
+                MODEL_MP05,
                 MODEL_NS_R1RHO_2SITE
             ]
 
@@ -728,6 +728,7 @@
         MODEL_M61B,
         MODEL_DPL94,
         MODEL_TP02,
+        MODEL_MP05,
         MODEL_NS_R1RHO_2SITE,
         None,
         MODEL_MQ_CR72,
@@ -755,6 +756,7 @@
         "{%s, ..., %s, %s}" % (r1rho_prime, phi_ex, kex),
         "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex),
         "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex),
+        "{%s, ..., pA, %s, %s}" % (r1rho_prime, dw, kex),
         None,
         "{%s, ..., pA, %s, %s, %s}" % (r2, dw, dwH, kex),
         "{%s, ..., pA, %s, %s, %s}" % (r2, dw, dwH, kex)
@@ -780,6 +782,7 @@
         "The Meiboom (1961) 2-site equation for all time scales with pA >> 
pB.",
         "The Davis, Perlman and London (1994) 2-site fast exchange 
equation.",
         "The Trott and Palmer (2002) 2-site equation for all time scales.",
+        "The Miloushev and Palmer (2005) off-resonance 2-site equation for 
all time scales.",
         "The 2-site numerical solution using 3D magnetisation vectors.",
         None,
         "The CR72 2-site model extended to MQ CPMG data by Korzhnev et al., 
2004.",