r20006 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- June 10, 2013 - 14:27

Author: bugman
Date: Mon Jun 10 14:27:44 2013
New Revision: 20006

URL: http://svn.gna.org/viewcvs/relax?rev=20006&view=rev
Log:
Updated the model lists of the dispersion analyses GUI element.

This adds the IT99 CPMG-type model and the DPL94 and M61B R1rho-type models.


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=20006&r1=20005&r2=20006&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Mon Jun 10 14:27:44 
2013
@@ -46,7 +46,7 @@
 from pipe_control.mol_res_spin import exists_mol_res_spin_data, spin_loop
 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 CPMG_EXP, MODEL_CR72, 
MODEL_LIST_CPMG_FULL, MODEL_LIST_R1RHO_FULL, MODEL_LM63, MODEL_M61, 
MODEL_NOREX, MODEL_R2EFF
+from specific_analyses.relax_disp.variables import CPMG_EXP, MODEL_CR72, 
MODEL_DPL94, MODEL_IT99, MODEL_LIST_CPMG_FULL, MODEL_LIST_R1RHO_FULL, 
MODEL_LM63, MODEL_M61, MODEL_M61B, MODEL_NOREX, MODEL_R2EFF
 from status import Status; status = Status()
 
 
@@ -512,13 +512,15 @@
         MODEL_R2EFF,
         MODEL_NOREX,
         MODEL_LM63,
-        MODEL_CR72
+        MODEL_CR72,
+        MODEL_IT99
     ]
     params = [
         u"{R2eff, I\u2080}",
         u"{R\u2082, ...}",
         u"{R\u2082, ..., phi_ex, kex}",
-        u"{R\u2082, ..., R2a, kA, d\u03C9}"
+        u"{R\u2082, ..., pA, d\u03C9, kex}",
+        u"{R\u2082, ..., phi_ex, pA.d\u03C9^2, kex}"
     ]
     tooltip = "The list of all relaxation dispersion models to be optimised 
as part of the protocol."
     tooltip_button = "Open the model list selector window."
@@ -534,11 +536,15 @@
         MODEL_R2EFF,
         MODEL_NOREX,
         MODEL_M61,
+        MODEL_DPL94,
+        MODEL_M61B
     ]
     params = [
         u"{R\u2081\u1D68, I\u2080}",
         u"{R\u2081\u1D68', ...}",
         u"{R\u2081\u1D68', ..., phi_ex, kex}",
+        u"{R\u2081\u1D68', ..., phi_ex, kex}",
+        u"{R\u2081\u1D68', ..., pA, d\u03C9, kex}",
     ]
     tooltip = "The list of all relaxation dispersion models to be optimised 
as part of the protocol."
     tooltip_button = "Open the model list selector window."