Author: bugman
Date: Mon Sep 2 19:05:03 2013
New Revision: 20760
URL: http://svn.gna.org/viewcvs/relax?rev=20760&view=rev
Log:
Merged revisions 20758-20759 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r20758 | bugman | 2013-09-02 19:03:23 +0200 (Mon, 02 Sep 2013) | 6 lines
The model_free.select_model user function GUI element now uses unicode for
the model parameters.
The tau character is now used for the tm, te, tf, and ts parameters. And a
superscript 2 is used
for the order parameters.
........
r20759 | bugman | 2013-09-02 19:03:58 +0200 (Mon, 02 Sep 2013) | 3 lines
The model lists in the model-free GUI auto-analysis now use unicode for the
S2 parameters.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/gui/analyses/auto_model_free.py
branches/relax_disp/user_functions/model_free.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 2 19:05:03 2013
@@ -1,1 +1,1 @@
-/trunk:1-20748
+/trunk:1-20759
Modified: branches/relax_disp/gui/analyses/auto_model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=20760&r1=20759&r2=20760&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_model_free.py (original)
+++ branches/relax_disp/gui/analyses/auto_model_free.py Mon Sep 2 19:05:03
2013
@@ -829,14 +829,14 @@
]
params = [
u"{local \u03C4m}",
- u"{local \u03C4m, S2}",
- u"{local \u03C4m, S2, \u03C4e}",
- u"{local \u03C4m, S2, Rex}",
- u"{local \u03C4m, S2, \u03C4e, Rex}",
- u"{local \u03C4m, S2, S2f, \u03C4s}",
- u"{local \u03C4m, S2, \u03C4f, S2f, \u03C4s}",
- u"{local \u03C4m, S2, S2f, \u03C4s, Rex}",
- u"{local \u03C4m, S2, \u03C4f, S2f, \u03C4s, Rex}",
+ u"{local \u03C4m, S\u00B2}",
+ u"{local \u03C4m, S\u00B2, \u03C4e}",
+ u"{local \u03C4m, S\u00B2, Rex}",
+ u"{local \u03C4m, S\u00B2, \u03C4e, Rex}",
+ u"{local \u03C4m, S\u00B2, S\u00B2f, \u03C4s}",
+ u"{local \u03C4m, S\u00B2, \u03C4f, S\u00B2f, \u03C4s}",
+ u"{local \u03C4m, S\u00B2, S\u00B2f, \u03C4s, Rex}",
+ u"{local \u03C4m, S\u00B2, \u03C4f, S\u00B2f, \u03C4s, Rex}",
u"{local \u03C4m, Rex}"
]
warning = "The model-free models used in dauvergne_protocol
auto-analysis should almost never be changed! The consequences will be
unpredictable. Please proceed only if you are sure of what you are doing.
Would you like to modify the model-free model list?"
@@ -865,14 +865,14 @@
]
params = [
u"{}",
- u"{S2}",
- u"{S2, \u03C4e}",
- u"{S2, Rex}",
- u"{S2, \u03C4e, Rex}",
- u"{S2, S2f, \u03C4s}",
- u"{S2, \u03C4f, S2f, \u03C4s}",
- u"{S2, S2f, \u03C4s, Rex}",
- u"{S2, \u03C4f, S2f, \u03C4s, Rex}",
+ u"{S\u00B2}",
+ u"{S\u00B2, \u03C4e}",
+ u"{S\u00B2, Rex}",
+ u"{S\u00B2, \u03C4e, Rex}",
+ u"{S\u00B2, S\u00B2f, \u03C4s}",
+ u"{S\u00B2, \u03C4f, S\u00B2f, \u03C4s}",
+ u"{S\u00B2, S\u00B2f, \u03C4s, Rex}",
+ u"{S\u00B2, \u03C4f, S\u00B2f, \u03C4s, Rex}",
u"{Rex}"
]
warning = "The model-free models used in dauvergne_protocol
auto-analysis should almost never be changed! The consequences will be
unpredictable. Please proceed only if you are sure of what you are doing.
Would you like to modify the model-free model list?"
Modified: branches/relax_disp/user_functions/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/model_free.py?rev=20760&r1=20759&r2=20760&view=diff
==============================================================================
--- branches/relax_disp/user_functions/model_free.py (original)
+++ branches/relax_disp/user_functions/model_free.py Mon Sep 2 19:05:03 2013
@@ -214,93 +214,93 @@
desc = "The name of the preset model.",
wiz_element_type = "combo",
wiz_combo_choices = [
- "m0: {}",
- "m1: {S2}",
- "m2: {S2, te}",
- "m3: {S2, Rex}",
- "m4: {S2, te, Rex}",
- "m5: {S2f, S2, ts}",
- "m6: {S2f, tf, S2, ts}",
- "m7: {S2f, S2, ts, Rex}",
- "m8: {S2f, tf, S2, ts, Rex}",
- "m9: {Rex}",
- "",
- "tm0: {tm}",
- "tm1: {tm, S2}",
- "tm2: {tm, S2, te}",
- "tm3: {tm, S2, Rex}",
- "tm4: {tm, S2, te, Rex}",
- "tm5: {tm, S2f, S2, ts}",
- "tm6: {tm, S2f, tf, S2, ts}",
- "tm7: {tm, S2f, S2, ts, Rex}",
- "tm8: {tm, S2f, tf, S2, ts, Rex}",
- "tm9: {tm, Rex}",
- "",
- "m10: {CSA}",
- "m11: {CSA, S2}",
- "m12: {CSA, S2, te}",
- "m13: {CSA, S2, Rex}",
- "m14: {CSA, S2, te, Rex}",
- "m15: {CSA, S2f, S2, ts}",
- "m16: {CSA, S2f, tf, S2, ts}",
- "m17: {CSA, S2f, S2, ts, Rex}",
- "m18: {CSA, S2f, tf, S2, ts, Rex}",
- "m19: {CSA, Rex}",
- "",
- "tm10: {tm, CSA}",
- "tm11: {tm, CSA, S2}",
- "tm12: {tm, CSA, S2, te}",
- "tm13: {tm, CSA, S2, Rex}",
- "tm14: {tm, CSA, S2, te, Rex}",
- "tm15: {tm, CSA, S2f, S2, ts}",
- "tm16: {tm, CSA, S2f, tf, S2, ts}",
- "tm17: {tm, CSA, S2f, S2, ts, Rex}",
- "tm18: {tm, CSA, S2f, tf, S2, ts, Rex}",
- "tm19: {tm, CSA, Rex}",
- "",
- "m20: {r}",
- "m21: {r, S2}",
- "m22: {r, S2, te}",
- "m23: {r, S2, Rex}",
- "m24: {r, S2, te, Rex}",
- "m25: {r, S2f, S2, ts}",
- "m26: {r, S2f, tf, S2, ts}",
- "m27: {r, S2f, S2, ts, Rex}",
- "m28: {r, S2f, tf, S2, ts, Rex}",
- "m29: {r, CSA, Rex}",
- "",
- "tm20: {tm, r}",
- "tm21: {tm, r, S2}",
- "tm22: {tm, r, S2, te}",
- "tm23: {tm, r, S2, Rex}",
- "tm24: {tm, r, S2, te, Rex}",
- "tm25: {tm, r, S2f, S2, ts}",
- "tm26: {tm, r, S2f, tf, S2, ts}",
- "tm27: {tm, r, S2f, S2, ts, Rex}",
- "tm28: {tm, r, S2f, tf, S2, ts, Rex}",
- "tm29: {tm, r, CSA, Rex}",
- "",
- "m30: {r, CSA}",
- "m31: {r, CSA, S2}",
- "m32: {r, CSA, S2, te}",
- "m33: {r, CSA, S2, Rex}",
- "m34: {r, CSA, S2, te, Rex}",
- "m35: {r, CSA, S2f, S2, ts}",
- "m36: {r, CSA, S2f, tf, S2, ts}",
- "m37: {r, CSA, S2f, S2, ts, Rex}",
- "m38: {r, CSA, S2f, tf, S2, ts, Rex}",
- "m39: {r, CSA, Rex}",
- "",
- "tm30: {tm, r, CSA}",
- "tm31: {tm, r, CSA, S2}",
- "tm32: {tm, r, CSA, S2, te}",
- "tm33: {tm, r, CSA, S2, Rex}",
- "tm34: {tm, r, CSA, S2, te, Rex}",
- "tm35: {tm, r, CSA, S2f, S2, ts}",
- "tm36: {tm, r, CSA, S2f, tf, S2, ts}",
- "tm37: {tm, r, CSA, S2f, S2, ts, Rex}",
- "tm38: {tm, r, CSA, S2f, tf, S2, ts, Rex}",
- "tm39: {tm, r, CSA, Rex}"
+ u"m0: {}",
+ u"m1: {S\u00B2}",
+ u"m2: {S\u00B2, \u03C4e}",
+ u"m3: {S\u00B2, Rex}",
+ u"m4: {S\u00B2, \u03C4e, Rex}",
+ u"m5: {S\u00B2f, S\u00B2, \u03C4s}",
+ u"m6: {S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"m7: {S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"m8: {S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"m9: {Rex}",
+ u"",
+ u"tm0: {\u03C4m}",
+ u"tm1: {\u03C4m, S\u00B2}",
+ u"tm2: {\u03C4m, S\u00B2, \u03C4e}",
+ u"tm3: {\u03C4m, S\u00B2, Rex}",
+ u"tm4: {\u03C4m, S\u00B2, \u03C4e, Rex}",
+ u"tm5: {\u03C4m, S\u00B2f, S\u00B2, \u03C4s}",
+ u"tm6: {\u03C4m, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"tm7: {\u03C4m, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"tm8: {\u03C4m, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"tm9: {\u03C4m, Rex}",
+ u"",
+ u"m10: {CSA}",
+ u"m11: {CSA, S\u00B2}",
+ u"m12: {CSA, S\u00B2, \u03C4e}",
+ u"m13: {CSA, S\u00B2, Rex}",
+ u"m14: {CSA, S\u00B2, \u03C4e, Rex}",
+ u"m15: {CSA, S\u00B2f, S\u00B2, \u03C4s}",
+ u"m16: {CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"m17: {CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"m18: {CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"m19: {CSA, Rex}",
+ u"",
+ u"tm10: {\u03C4m, CSA}",
+ u"tm11: {\u03C4m, CSA, S\u00B2}",
+ u"tm12: {\u03C4m, CSA, S\u00B2, \u03C4e}",
+ u"tm13: {\u03C4m, CSA, S\u00B2, Rex}",
+ u"tm14: {\u03C4m, CSA, S\u00B2, \u03C4e, Rex}",
+ u"tm15: {\u03C4m, CSA, S\u00B2f, S\u00B2, \u03C4s}",
+ u"tm16: {\u03C4m, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"tm17: {\u03C4m, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"tm18: {\u03C4m, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"tm19: {\u03C4m, CSA, Rex}",
+ u"",
+ u"m20: {r}",
+ u"m21: {r, S\u00B2}",
+ u"m22: {r, S\u00B2, \u03C4e}",
+ u"m23: {r, S\u00B2, Rex}",
+ u"m24: {r, S\u00B2, \u03C4e, Rex}",
+ u"m25: {r, S\u00B2f, S\u00B2, \u03C4s}",
+ u"m26: {r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"m27: {r, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"m28: {r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"m29: {r, CSA, Rex}",
+ u"",
+ u"tm20: {\u03C4m, r}",
+ u"tm21: {\u03C4m, r, S\u00B2}",
+ u"tm22: {\u03C4m, r, S\u00B2, \u03C4e}",
+ u"tm23: {\u03C4m, r, S\u00B2, Rex}",
+ u"tm24: {\u03C4m, r, S\u00B2, \u03C4e, Rex}",
+ u"tm25: {\u03C4m, r, S\u00B2f, S\u00B2, \u03C4s}",
+ u"tm26: {\u03C4m, r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"tm27: {\u03C4m, r, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"tm28: {\u03C4m, r, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"tm29: {\u03C4m, r, CSA, Rex}",
+ u"",
+ u"m30: {r, CSA}",
+ u"m31: {r, CSA, S\u00B2}",
+ u"m32: {r, CSA, S\u00B2, \u03C4e}",
+ u"m33: {r, CSA, S\u00B2, Rex}",
+ u"m34: {r, CSA, S\u00B2, \u03C4e, Rex}",
+ u"m35: {r, CSA, S\u00B2f, S\u00B2, \u03C4s}",
+ u"m36: {r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"m37: {r, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"m38: {r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s, Rex}",
+ u"m39: {r, CSA, Rex}",
+ u"",
+ u"tm30: {\u03C4m, r, CSA}",
+ u"tm31: {\u03C4m, r, CSA, S\u00B2}",
+ u"tm32: {\u03C4m, r, CSA, S\u00B2, \u03C4e}",
+ u"tm33: {\u03C4m, r, CSA, S\u00B2, Rex}",
+ u"tm34: {\u03C4m, r, CSA, S\u00B2, \u03C4e, Rex}",
+ u"tm35: {\u03C4m, r, CSA, S\u00B2f, S\u00B2, \u03C4s}",
+ u"tm36: {\u03C4m, r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s}",
+ u"tm37: {\u03C4m, r, CSA, S\u00B2f, S\u00B2, \u03C4s, Rex}",
+ u"tm38: {\u03C4m, r, CSA, S\u00B2f, \u03C4f, S\u00B2, \u03C4s,
Rex}",
+ u"tm39: {\u03C4m, r, CSA, Rex}"
],
wiz_combo_data = [
"m0",
r20760 - in /branches/relax_disp: ./ gui/analyses/auto_model_free.py user_functions/model_free.py