Author: bugman Date: Wed Jul 31 16:56:21 2013 New Revision: 20483 URL: http://svn.gna.org/viewcvs/relax?rev=20483&view=rev Log: Added the 'TP02' model to the specific_analyses.relax_disp.variables module. This is the Trott and Palmer 2002 R1rho analytic model for 2-site exchange. This commit follows step 1 of the relaxation dispersion model addition tutorial (http://thread.gmane.org/gmane.science.nmr.relax.devel/3907). Modified: branches/relax_disp/specific_analyses/relax_disp/variables.py Modified: branches/relax_disp/specific_analyses/relax_disp/variables.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/variables.py?rev=20483&r1=20482&r2=20483&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp/variables.py (original) +++ branches/relax_disp/specific_analyses/relax_disp/variables.py Wed Jul 31 16:56:21 2013 @@ -68,6 +68,9 @@ MODEL_M61B = 'M61 skew' """The R1rho 2-site model for all time scales with pA >> pB of Meiboom (1961).""" +MODEL_TP02 = 'TP02' +"""The R1rho 2-site exchange model of Trott and Palmer (2002).""" + # The Numerical model names. MODEL_NS_2SITE_3D = 'NS 2-site 3D' @@ -87,10 +90,10 @@ # The model lists. -MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED] +MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_TP02, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED] """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_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED] +MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_TP02, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED] """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_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_2SITE_EXPANDED] @@ -99,8 +102,8 @@ MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_IT99, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_3D_FULL, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_STAR_FULL, MODEL_NS_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_DPL94, MODEL_M61B] +MODEL_LIST_R1RHO = [MODEL_NOREX, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_TP02] """The list of all dispersion models specifically for R1rho-type experiments (excluding the R2eff model).""" -MODEL_LIST_R1RHO_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_M61, MODEL_DPL94, MODEL_M61B] +MODEL_LIST_R1RHO_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_TP02] """The list of the R2eff model together with all dispersion models specifically for R1rho-type experiments."""