r24934 - in /branches/R1_fitting: auto_analyses/relax_disp.py specific_analyses/relax_disp/parameters.py -- August 04, 2014 - 16:27

Author: tlinnet
Date: Mon Aug  4 16:27:53 2014
New Revision: 24934

URL: http://svn.gna.org/viewcvs/relax?rev=24934&view=rev
Log:
Replaced instances of "['r2', 'r2a', 'r2b']" with variablÃe PARAMS_R20.

sr #3135(https://gna.org/support/?3135): Optimisation of the R1 relaxation 
rate for the off-resonance R1rho relaxation dispersion models.

Modified:
    branches/R1_fitting/auto_analyses/relax_disp.py
    branches/R1_fitting/specific_analyses/relax_disp/parameters.py

Modified: branches/R1_fitting/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/auto_analyses/relax_disp.py?rev=24934&r1=24933&r2=24934&view=diff
==============================================================================
--- branches/R1_fitting/auto_analyses/relax_disp.py     (original)
+++ branches/R1_fitting/auto_analyses/relax_disp.py     Mon Aug  4 16:27:53 
2014
@@ -38,7 +38,7 @@
 from prompt.interpreter import Interpreter
 from specific_analyses.relax_disp.data import has_exponential_exp_type, 
has_cpmg_exp_type, has_fixed_time_exp_type, has_r1rho_exp_type, loop_frq
 from specific_analyses.relax_disp.data import INTERPOLATE_DISP, 
INTERPOLATE_OFFSET, X_AXIS_DISP, X_AXIS_W_EFF, X_AXIS_THETA, Y_AXIS_R2_R1RHO, 
Y_AXIS_R2_EFF
-from specific_analyses.relax_disp.variables import MODEL_B14, 
MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, 
MODEL_LIST_ANALYTIC, MODEL_LIST_NUMERIC, MODEL_LIST_R1RHO, 
MODEL_LIST_R1RHO_FULL, MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, 
MODEL_MP05, MODEL_MMQ_CR72, 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_MMQ_2SITE, 
MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, 
MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAMS, MODEL_R2EFF, 
MODEL_TAP03, MODEL_TP02, MODEL_TSMFK01
+from specific_analyses.relax_disp.variables import MODEL_B14, 
MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94, MODEL_IT99, 
MODEL_LIST_ANALYTIC, MODEL_LIST_NUMERIC, MODEL_LIST_R1RHO, 
MODEL_LIST_R1RHO_FULL, MODEL_LM63, MODEL_LM63_3SITE, MODEL_M61, MODEL_M61B, 
MODEL_MP05, MODEL_MMQ_CR72, 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_MMQ_2SITE, 
MODEL_NS_MMQ_3SITE, MODEL_NS_MMQ_3SITE_LINEAR, MODEL_NS_R1RHO_2SITE, 
MODEL_NS_R1RHO_3SITE, MODEL_NS_R1RHO_3SITE_LINEAR, MODEL_PARAMS, MODEL_R2EFF, 
MODEL_TAP03, MODEL_TP02, MODEL_TSMFK01, PARAMS_R20
 from status import Status; status = Status()
 
 
@@ -358,7 +358,7 @@
 
             # All other spin parameters.
             for param in spin.params:
-                if param in ['r2', 'r2a', 'r2b']:
+                if param in PARAMS_R20:
                     continue
 
                 # The parameter does not exist.

Modified: branches/R1_fitting/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/R1_fitting/specific_analyses/relax_disp/parameters.py?rev=24934&r1=24933&r2=24934&view=diff
==============================================================================
--- branches/R1_fitting/specific_analyses/relax_disp/parameters.py      
(original)
+++ branches/R1_fitting/specific_analyses/relax_disp/parameters.py      Mon 
Aug  4 16:27:53 2014
@@ -339,7 +339,7 @@
         param_text = param_name
 
         # The parameters with additional details.
-        if full and param_name in ['r2', 'r2a', 'r2b']:
+        if full and param_name in PARAMS_R20:
             param_text += " (%s)" % r20_key
  
         # Append the text.
@@ -552,7 +552,7 @@
             j += 2
 
         # The transversal relaxation rates (0 <= r2 <= 200).
-        elif param_name in ['r2', 'r2a', 'r2b']:
+        elif param_name in PARAMS_R20:
             A.append(zero_array * 0.0)
             A.append(zero_array * 0.0)
             A[j][param_index] = 1.0