r20757 - /branches/relax_disp/user_functions/relax_disp.py -- September 02, 2013 - 18:55

Author: bugman
Date: Mon Sep  2 18:55:01 2013
New Revision: 20757

URL: http://svn.gna.org/viewcvs/relax?rev=20757&view=rev
Log:
The relax_disp.select_model GUI wizard combo element now uses unicode for the 
dispersion parameters.

This is for all the models.  The 'LM63 3-site' model parameter list has also 
been fixed to match the
current set.


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=20757&r1=20756&r2=20757&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Mon Sep  2 18:55:01 2013
@@ -474,24 +474,24 @@
     desc = "The type of relaxation dispersion model to fit.",
     wiz_element_type = "combo",
     wiz_combo_choices = [
-        "%s: {R2eff/R1rho, I0}" % MODEL_R2EFF,
-        "%s: {R20, ...}" % MODEL_NOREX,
-        "%s: {R20, ..., phi_ex, kex}" % MODEL_LM63,
-        "%s: {R20A, ..., dw, kA}" % MODEL_TSMFK01,
-        "%s: {R20, ..., phi_ex, kex, phi_ex2, kex2}" % MODEL_LM63_3SITE,
-        "%s: {R20, ..., pA, dw, kex}" % MODEL_CR72,
-        "%s: {R20A, R20B, ..., pA, dw, kex}" % MODEL_CR72_FULL,
-        "%s: {R20, ..., phi_ex, padw2, kex}" % MODEL_IT99,
-        "%s: {R20, ..., pA, dw, kex}" % MODEL_NS_CPMG_2SITE_3D,
-        "%s: {R20A, R20B, ..., pA, dw, kex}" % MODEL_NS_CPMG_2SITE_3D_FULL,
-        "%s: {R20, ..., pA, dw, kex}" % MODEL_NS_CPMG_2SITE_STAR,
-        "%s: {R20A, R20B, ..., pA, dw, kex}" % MODEL_NS_CPMG_2SITE_STAR_FULL,
-        "%s: {R20, ..., pA, dw, kex}" % MODEL_NS_CPMG_2SITE_EXPANDED,
-        "%s: {R1rho', ..., phi_ex, kex}" % MODEL_M61,
-        "%s: {R1rho', ..., phi_ex, kex}" % MODEL_DPL94,
-        "%s: {R1rho', ..., pA, dw, kex}" % MODEL_M61B,
-        "%s: {R1rho', ..., pA, dw, kex}" % MODEL_TP02,
-        "%s: {R20, ..., pA, dw, kex}" % MODEL_NS_R1RHO_2SITE
+        u"%s: {R\u2082eff/R\u2081\u1D68, I\u2080}" % MODEL_R2EFF,
+        u"%s: {R\u2082, ...}" % MODEL_NOREX,
+        u"%s: {R\u2082, ..., \u03D5\u2091\u2093, k\u2091\u2093}" % 
MODEL_LM63,
+        u"%s: {R\u2082A, ..., d\u03C9, kA}" % MODEL_TSMFK01,
+        u"%s: {R\u2082, ..., \u03D5\u2091\u2093B, kB, \u03D5\u2091\u2093C, 
kC}" % MODEL_LM63_3SITE,
+        u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" % MODEL_CR72,
+        u"%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_CR72_FULL,
+        u"%s: {R\u2082, ..., \u03D5\u2091\u2093, pA.d\u03C9\u00B2, 
k\u2091\u2093}" % MODEL_IT99,
+        u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_NS_CPMG_2SITE_3D,
+        u"%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_NS_CPMG_2SITE_3D_FULL,
+        u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_NS_CPMG_2SITE_STAR,
+        u"%s: {R\u2082A, R\u2082B, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_NS_CPMG_2SITE_STAR_FULL,
+        u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_NS_CPMG_2SITE_EXPANDED,
+        u"%s: {R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}" % 
MODEL_M61,
+        u"%s: {R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}" % 
MODEL_DPL94,
+        u"%s: {R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_M61B,
+        u"%s: {R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_TP02,
+        u"%s: {R\u2082, ..., pA, d\u03C9, k\u2091\u2093}" % 
MODEL_NS_R1RHO_2SITE
     ],
     wiz_combo_data = [
         MODEL_R2EFF,