r19772 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- May 29, 2013 - 15:24

Author: bugman
Date: Wed May 29 15:24:54 2013
New Revision: 19772

URL: http://svn.gna.org/viewcvs/relax?rev=19772&view=rev
Log:
Changed the dispersion GUI tab to use the model names from 
specific_analyses.relax_disp.variables.


Modified:
    branches/relax_disp/gui/analyses/auto_relax_disp.py

Modified: branches/relax_disp/gui/analyses/auto_relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_relax_disp.py?rev=19772&r1=19771&r2=19772&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Wed May 29 15:24:54 
2013
@@ -44,6 +44,7 @@
 from pipe_control.mol_res_spin import exists_mol_res_spin_data
 from pipe_control.pipes import has_bundle, has_pipe
 from specific_analyses.relax_disp import VAR_TIME_EXP
+from specific_analyses.relax_disp.variables import MODEL_R2EFF, MODEL_LM63, 
MODEL_CR72
 from status import Status; status = Status()
 
 
@@ -116,7 +117,7 @@
             ds.relax_gui.analyses[data_index].grid_inc = None
             ds.relax_gui.analyses[data_index].mc_sim_num = None
             ds.relax_gui.analyses[data_index].save_dir = self.gui.launch_dir
-            ds.relax_gui.analyses[data_index].disp_models = ['R2eff', 'fast 
2-site', 'slow 2-site']
+            ds.relax_gui.analyses[data_index].disp_models = [MODEL_R2EFF, 
MODEL_LM63, MODEL_CR72]
 
         # Error checking.
         if ds.relax_gui.analyses[data_index].pipe_bundle == None:
@@ -432,13 +433,13 @@
     # Class variables.
     desc = "Relaxation dispersion models:"
     models = [
-        "R2eff",
-        "fast 2-site",
-        "slow 2-site"
+        MODEL_R2EFF,
+        MODEL_LM63,
+        MODEL_CR72
     ]
     params = [
         u"{R2eff, I\u2080}",
-        u"{R\u2082, Rex, kex}",
+        u"{R\u2082, phi_ex, kex}",
         u"{R\u2082, R2a, kA, d\u03C9}"
     ]
     tooltip = "The list of all relaxation dispersion models to be optimised 
as part of the protocol."