Author: bugman
Date: Thu Aug 21 14:52:24 2014
New Revision: 25165
URL: http://svn.gna.org/viewcvs/relax?rev=25165&view=rev
Log:
Converted the relaxation dispersion GUI interface to the unified 'No Rex' model.
All of the MODEL_NOREX_R1RHO references have simply been deleted.
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=25165&r1=25164&r2=25165&view=diff
==============================================================================
--- trunk/gui/analyses/auto_relax_disp.py (original)
+++ trunk/gui/analyses/auto_relax_disp.py Thu Aug 21 14:52:24 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_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_NOREX_R1RHO,
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()
@@ -715,7 +715,6 @@
MODEL_R2EFF,
None,
MODEL_NOREX,
-# MODEL_NOREX_R1RHO,
None,
MODEL_LM63,
MODEL_LM63_3SITE,
@@ -750,7 +749,6 @@
"{%s/%s, %s}" % (r2eff, r1rho, i0),
None,
"{%s, ...}" % (r2),
-# "{%s, ...}" % (r2),
None,
"{%s, ..., %s, %s}" % (r2, phi_ex, kex),
"{%s, ..., %s, kB, %s, kC}" % (r2, phi_exB, phi_exC),
@@ -785,7 +783,6 @@
"The base model for determining the %s/%s values and errors for all
other models." % (r2eff, r1rho),
None,
"The model for no chemical exchange relaxation.",
-# "The model for no chemical exchange being present, for off-resonance
R1rho-type experiments. R1rho = R1 * cos(theta)^2 + r1rho_prime *
sin(theta)^2.",
None,
"The original Luz and Meiboom (1963) 2-site fast exchange equation.",
"The original Luz and Meiboom (1963) 3-site fast exchange equation.",
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
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
