r20755 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- September 02, 2013 - 18:14

Author: bugman
Date: Mon Sep  2 18:14:01 2013
New Revision: 20755

URL: http://svn.gna.org/viewcvs/relax?rev=20755&view=rev
Log:
Added the 'TP02' and 'NS R1rho 2-site' models to the R1rho model list in the 
dispersion GUI.

These models were missing from the list.


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=20755&r1=20754&r2=20755&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Mon Sep  2 18:14:01 
2013
@@ -46,7 +46,7 @@
 from gui.wizards.peak_intensity import Peak_intensity_wizard
 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.variables import CPMG_EXP, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, MODEL_LIST_CPMG_FULL, 
MODEL_LIST_R1RHO_FULL, MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, 
MODEL_NOREX, MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_R2EFF, VAR_TIME_EXP
+from specific_analyses.relax_disp.variables import CPMG_EXP, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, MODEL_LIST_CPMG_FULL, 
MODEL_LIST_R1RHO_FULL, MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, 
MODEL_NOREX, MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL, MODEL_NS_R1RHO_2SITE, MODEL_R2EFF, MODEL_TP02, 
VAR_TIME_EXP
 from status import Status; status = Status()
 
 
@@ -137,7 +137,9 @@
                     MODEL_R2EFF,
                     MODEL_NOREX,
                     MODEL_M61,
-                    MODEL_DPL94
+                    MODEL_DPL94,
+                    MODEL_TP02,
+                    MODEL_NS_R1RHO_2SITE
                 ]
 
         # Error checking.
@@ -695,7 +697,9 @@
         MODEL_NOREX,
         MODEL_M61,
         MODEL_DPL94,
-        MODEL_M61B
+        MODEL_M61B,
+        MODEL_TP02,
+        MODEL_NS_R1RHO_2SITE
     ]
     params = [
         u"{R\u2081\u1D68, I\u2080}",
@@ -703,6 +707,8 @@
         u"{R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}",
         u"{R\u2081\u1D68', ..., \u03D5\u2091\u2093, k\u2091\u2093}",
         u"{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}",
+        u"{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}",
+        u"{R\u2081\u1D68', ..., pA, d\u03C9, k\u2091\u2093}"
     ]
     tooltip = "The list of all relaxation dispersion models to be optimised 
as part of the protocol."
     tooltip_button = "Open the model list selector window."