Author: bugman
Date: Thu Oct 10 17:30:59 2013
New Revision: 21063
URL: http://svn.gna.org/viewcvs/relax?rev=21063&view=rev
Log:
Updated the relax_disp.exp_type user function for the new 'MQ CPMG' and 'MQ
R1rho' experiment types.
This is needed for the 'MQ NS CPMG 2-site' model.
This follows the tutorial for adding relaxation dispersion models at:
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax#Creating_a_new_experiment_type.
Modified:
branches/relax_disp/user_functions/relax_disp.py
Modified: branches/relax_disp/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=21063&r1=21062&r2=21063&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Thu Oct 10 17:30:59 2013
@@ -42,7 +42,7 @@
from specific_analyses.relax_disp.nessy import nessy_input
from specific_analyses.relax_disp.parameters import copy
from specific_analyses.relax_disp.sherekhan import sherekhan_input
-from specific_analyses.relax_disp.variables import MODEL_CR72,
MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, MODEL_LM63, MODEL_LM63_3SITE,
MODEL_M61, MODEL_M61B, MODEL_MQ_NS_CPMG_2SITE, MODEL_NOREX, MODEL_R2EFF,
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_TP02, MODEL_TSMFK01
+from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG,
EXP_TYPE_MQ_CPMG, EXP_TYPE_MQ_R1RHO, EXP_TYPE_R1RHO, MODEL_CR72,
MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, MODEL_LM63, MODEL_LM63_3SITE,
MODEL_M61, MODEL_M61B, MODEL_MQ_NS_CPMG_2SITE, MODEL_NOREX, MODEL_R2EFF,
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_TP02, MODEL_TSMFK01
from specific_analyses.setup import relax_disp_obj
from user_functions.data import Uf_info; uf_info = Uf_info()
from user_functions.objects import Desc_container
@@ -323,8 +323,10 @@
uf.desc.append(Desc_container())
uf.desc[-1].add_paragraph("For each peak intensity set loaded into relax,
the type of experiment it comes from needs to be specified. By specifying
this for each spectrum ID, multiple experiment types can be analysed
simultaneously. This is assuming that an appropriate dispersion model exists
for the experiment combination.")
uf.desc[-1].add_paragraph("The currently supported experiments include:")
-uf.desc[-1].add_item_list_element("'CPMG'", "The CPMG-type experiments,")
-uf.desc[-1].add_item_list_element("'R1rho'", "The R1rho-type experiments.")
+uf.desc[-1].add_item_list_element(repr(EXP_TYPE_CPMG), "The CPMG-type
experiments,")
+uf.desc[-1].add_item_list_element(EXP_TYPE_R1RHO, "The R1rho-type
experiments.")
+uf.desc[-1].add_item_list_element(EXP_TYPE_MQ_CPMG, "The multi-quantum
CPMG-type experiments,")
+uf.desc[-1].add_item_list_element(EXP_TYPE_MQ_R1RHO, "The multi-quantum
R1rho-type experiments.")
# Prompt examples.
uf.desc.append(Desc_container("Prompt examples"))
uf.desc[-1].add_paragraph("To set the experiment type to 'CPMG' for the
spectrum ID 'nu_4500.0_800MHz', type one of:")
r21063 - /branches/relax_disp/user_functions/relax_disp.py