r19861 - /branches/relax_disp/gui/analyses/auto_relax_disp.py -- June 04, 2013 - 16:10

Author: bugman
Date: Tue Jun  4 16:10:46 2013
New Revision: 19861

URL: http://svn.gna.org/viewcvs/relax?rev=19861&view=rev
Log:
Added support for the R1rho-type experiments to the relaxation dispersion 
analysis in the GUI.

This involves using a different model list for these experiments compared to 
the CPMG-type
experiments.


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=19861&r1=19860&r2=19861&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_relax_disp.py (original)
+++ branches/relax_disp/gui/analyses/auto_relax_disp.py Tue Jun  4 16:10:46 
2013
@@ -44,7 +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_CR72, 
MODEL_LIST_FULL, MODEL_LM63, MODEL_NOREX, MODEL_R2EFF
+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 status import Status; status = Status()
 
 
@@ -117,7 +117,12 @@
             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 = MODEL_LIST_FULL
+
+            # Set the dispersion models based on the experiment type.
+            if cdp.exp_type in CPMG_EXP:
+                ds.relax_gui.analyses[data_index].disp_models = 
MODEL_LIST_CPMG_FULL
+            else:
+                ds.relax_gui.analyses[data_index].disp_models = 
MODEL_LIST_R1RHO_FULL
 
         # Error checking.
         if ds.relax_gui.analyses[data_index].pipe_bundle == None:
@@ -135,7 +140,7 @@
         if cdp.exp_type in VAR_TIME_EXP:
             self.relax_times_flag = True
         self.relax_disp_cpmg = False
-        if cdp.exp_type in ['cpmg', 'cpmg fixed']:
+        if cdp.exp_type in CPMG_EXP:
             self.relax_disp_cpmg = True
 
         # Execute the base class method to build the panel.
@@ -242,7 +247,10 @@
         box.AddSpacer(10)
 
         # Add the dispersion models GUI element, with spacing.
-        self.model_field = Disp_model_list(self, box)
+        if cdp.exp_type in CPMG_EXP:
+            self.model_field = Disp_model_list_cpmg(self, box)
+        else:
+            self.model_field = Disp_model_list_r1rho(self, box)
         self.model_field.set_value(self.data.disp_models)
 
         # The optimisation settings.
@@ -440,7 +448,7 @@
 
 
 
-class Disp_model_list(Model_list):
+class Disp_model_list_cpmg(Model_list):
     """The diffusion model list GUI element."""
 
     # Class variables.
@@ -459,3 +467,23 @@
     ]
     tooltip = "The list of all relaxation dispersion models to be optimised 
as part of the protocol."
     tooltip_button = "Open the model list selector window."
+
+
+
+class Disp_model_list_r1rho(Model_list):
+    """The diffusion model list GUI element."""
+
+    # Class variables.
+    desc = "Relaxation dispersion models:"
+    models = [
+        MODEL_R2EFF,
+        MODEL_NOREX,
+        MODEL_M61,
+    ]
+    params = [
+        u"{R\u2081\u1D68, I\u2080}",
+        u"{R\u2081\u1D68', ...}",
+        u"{R\u2081\u1D68', ..., phi_ex, 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."