r24976 - /branches/R1_fitting/specific_analyses/relax_disp/variables.py -- August 11, 2014 - 09:09

Author: tlinnet
Date: Mon Aug 11 09:09:16 2014
New Revision: 24976

URL: http://svn.gna.org/viewcvs/relax?rev=24976&view=rev
Log:
Added dictionary for returning year, when using model as key.

sr #3135(https://gna.org/support/?3135): Optimisation of the R1 relaxation 
rate for the off-resonance R1rho relaxation dispersion models.

Modified:
    branches/R1_fitting/specific_analyses/relax_disp/variables.py

Modified: branches/R1_fitting/specific_analyses/relax_disp/variables.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/variables.py?rev=24976&r1=24975&r2=24976&view=diff
==============================================================================
--- branches/R1_fitting/specific_analyses/relax_disp/variables.py       
(original)
+++ branches/R1_fitting/specific_analyses/relax_disp/variables.py       Mon 
Aug 11 09:09:16 2014
@@ -219,7 +219,7 @@
 MODEL_NS_R1RHO_3SITE_LINEAR = 'NS R1rho 3-site linear'
 MODEL_DESC_NS_R1RHO_3SITE_LINEAR = "The numerical solution for the 3-site 
Bloch-McConnell equations using 3D magnetisation vectors for R1rho-type 
experiments, linearised with kAC = kCA = 0 and whereby the simplification 
R20A = R20B = R20C is assumed."
 MODEL_PARAMS_NS_R1RHO_3SITE_LINEAR = ['r2', 'pA', 'dw_AB', 'kex_AB', 'pB', 
'dw_BC', 'kex_BC']
-MODEL_NS_R1RHO_3SITE_LINEAR = 2005
+MODEL_YEAR_NS_R1RHO_3SITE_LINEAR = 2005
 
 
 # The multi-quantum data model names.
@@ -461,3 +461,42 @@
     MODEL_NS_MMQ_3SITE: MODEL_PARAMS_NS_MMQ_3SITE,
     MODEL_NS_MMQ_3SITE_LINEAR: MODEL_PARAMS_NS_MMQ_3SITE_LINEAR
 }
+
+# Full year list.
+MODEL_YEAR = {
+    MODEL_R2EFF: MODEL_YEAR_R2EFF,
+    MODEL_NOREX: MODEL_YEAR_NOREX,
+    MODEL_NOREX_R1RHO: MODEL_YEAR_NOREX_R1RHO,
+    MODEL_NOREX_R1RHO_FIT_R1: MODEL_YEAR_NOREX_R1RHO_FIT_R1,
+    MODEL_LM63: MODEL_YEAR_LM63,
+    MODEL_LM63_3SITE: MODEL_YEAR_LM63_3SITE,
+    MODEL_CR72: MODEL_YEAR_CR72,
+    MODEL_CR72_FULL: MODEL_YEAR_CR72_FULL,
+    MODEL_IT99: MODEL_YEAR_IT99,
+    MODEL_TSMFK01: MODEL_YEAR_TSMFK01,
+    MODEL_B14: MODEL_YEAR_B14,
+    MODEL_B14_FULL: MODEL_YEAR_B14_FULL,
+    MODEL_M61: MODEL_YEAR_M61,
+    MODEL_M61B: MODEL_YEAR_M61B,
+    MODEL_DPL94: MODEL_YEAR_DPL94,
+    MODEL_DPL94_FIT_R1: MODEL_YEAR_DPL94_FIT_R1,
+    MODEL_TP02: MODEL_YEAR_TP02,
+    MODEL_TP02_FIT_R1: MODEL_YEAR_TP02_FIT_R1,
+    MODEL_TAP03: MODEL_YEAR_TAP03,
+    MODEL_TAP03_FIT_R1: MODEL_YEAR_TAP03_FIT_R1,
+    MODEL_MP05: MODEL_YEAR_MP05,
+    MODEL_MP05_FIT_R1: MODEL_YEAR_MP05_FIT_R1,
+    MODEL_NS_CPMG_2SITE_3D: MODEL_YEAR_NS_CPMG_2SITE_3D,
+    MODEL_NS_CPMG_2SITE_3D_FULL: MODEL_YEAR_NS_CPMG_2SITE_3D_FULL,
+    MODEL_NS_CPMG_2SITE_STAR: MODEL_YEAR_NS_CPMG_2SITE_STAR,
+    MODEL_NS_CPMG_2SITE_STAR_FULL: MODEL_YEAR_NS_CPMG_2SITE_STAR_FULL,
+    MODEL_NS_CPMG_2SITE_EXPANDED: MODEL_YEAR_NS_CPMG_2SITE_EXPANDED,
+    MODEL_NS_R1RHO_2SITE: MODEL_YEAR_NS_R1RHO_2SITE,
+    MODEL_NS_R1RHO_2SITE_FIT_R1: MODEL_YEAR_NS_R1RHO_2SITE_FIT_R1,
+    MODEL_NS_R1RHO_3SITE: MODEL_YEAR_NS_R1RHO_3SITE,
+    MODEL_NS_R1RHO_3SITE_LINEAR: MODEL_YEAR_NS_R1RHO_3SITE_LINEAR,
+    MODEL_MMQ_CR72: MODEL_YEAR_MMQ_CR72,
+    MODEL_NS_MMQ_2SITE: MODEL_YEAR_NS_MMQ_2SITE,
+    MODEL_NS_MMQ_3SITE: MODEL_YEAR_NS_MMQ_3SITE,
+    MODEL_NS_MMQ_3SITE_LINEAR: MODEL_YEAR_NS_MMQ_3SITE_LINEAR
+}