r20359 - /branches/relax_disp/specific_analyses/relax_disp/variables.py -- July 17, 2013 - 15:23

Author: bugman
Date: Wed Jul 17 15:23:01 2013
New Revision: 20359

URL: http://svn.gna.org/viewcvs/relax?rev=20359&view=rev
Log:
Added the 'NS 2-site expanded' model to the 
specific_analyses.relax_disp.variables module.

This is the numerical model for the 2-site Bloch-McConnell equations expanded 
using Maple by Nikolai
Skrynnikov.

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=20359&r1=20358&r2=20359&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/variables.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/variables.py Wed Jul 17 
15:23:01 2013
@@ -79,18 +79,21 @@
 MODEL_NS_2SITE_STAR = 'NS 2-site star'
 """The numerical solution for the 2-site Bloch-McConnell equations using 
complex conjugate matrices."""
 
+MODEL_NS_2SITE_EXPANDED = 'NS 2-site expanded'
+"""The numerical solution for the 2-site Bloch-McConnell equations expanded 
using Maple by Nikolai Skrynnikov."""
+
 
 # The model lists.
-MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, MODEL_CR72, 
MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_3D_RED, 
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
+MODEL_LIST_DISP = [MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, MODEL_CR72, 
MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, MODEL_NS_2SITE_3D_RED, 
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR, 
MODEL_NS_2SITE_EXPANDED]
 """The list of all dispersion models (excluding the R2eff model)."""
 
-MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, 
MODEL_CR72, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, 
MODEL_NS_2SITE_3D_RED, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_STAR_RED, 
MODEL_NS_2SITE_STAR]
+MODEL_LIST_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, 
MODEL_CR72, MODEL_IT99, MODEL_M61, MODEL_DPL94, MODEL_M61B, 
MODEL_NS_2SITE_3D_RED, MODEL_NS_2SITE_3D, MODEL_NS_2SITE_STAR_RED, 
MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_EXPANDED]
 """The list of the R2eff model together with all dispersion models."""
 
-MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, MODEL_CR72, 
MODEL_IT99, MODEL_NS_2SITE_3D_RED, MODEL_NS_2SITE_3D, 
MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
+MODEL_LIST_CPMG = [MODEL_NOREX, MODEL_LM63, MODEL_CR72_RED, MODEL_CR72, 
MODEL_IT99, MODEL_NS_2SITE_3D_RED, MODEL_NS_2SITE_3D, 
MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR, MODEL_NS_2SITE_EXPANDED]
 """The list of all dispersion models specifically for CPMG-type experiments 
(excluding the R2eff model)."""
 
-MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
MODEL_CR72_RED, MODEL_CR72, MODEL_IT99, MODEL_NS_2SITE_3D_RED, 
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR]
+MODEL_LIST_CPMG_FULL = [MODEL_R2EFF, MODEL_NOREX, MODEL_LM63, 
MODEL_CR72_RED, MODEL_CR72, MODEL_IT99, MODEL_NS_2SITE_3D_RED, 
MODEL_NS_2SITE_3D, MODEL_NS_2SITE_STAR_RED, MODEL_NS_2SITE_STAR, 
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]