r25500 - /trunk/specific_analyses/relax_disp/api.py -- September 01, 2014 - 14:37

Author: bugman
Date: Mon Sep  1 14:37:07 2014
New Revision: 25500

URL: http://svn.gna.org/viewcvs/relax?rev=25500&view=rev
Log:
The dispersion get_param_values() API method now calls the r1_setup() 
function.

This relates to bug #22541 (https://gna.org/bugs/?22541), the R1 fit flag 
does not work in the GUI.

This is to make sure that the parameters are correctly set up prior to 
obtaining all parameter
values.  The R1 parameter is dynamic hence r1_setup() needs to be called at 
any point model
parameters are accessed, as the R1 parameter can be turned on or off at any 
time with the
relax_disp.r1_fit user function.


Modified:
    trunk/specific_analyses/relax_disp/api.py

Modified: trunk/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/api.py?rev=25500&r1=25499&r2=25500&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/api.py   (original)
+++ trunk/specific_analyses/relax_disp/api.py   Mon Sep  1 14:37:07 2014
@@ -44,7 +44,7 @@
 from specific_analyses.relax_disp.data import average_intensity, 
calc_rotating_frame_params, find_intensity_keys, generate_r20_key, 
has_exponential_exp_type, has_proton_mmq_cpmg, loop_cluster, loop_exp_frq, 
loop_exp_frq_offset_point, loop_time, pack_back_calc_r2eff, 
return_param_key_from_data, spin_ids_to_containers
 from specific_analyses.relax_disp.optimisation import Disp_memo, 
Disp_minimise_command, back_calc_peak_intensities, back_calc_r2eff, 
calculate_r2eff, minimise_r2eff
 from specific_analyses.relax_disp.parameter_object import Relax_disp_params
-from specific_analyses.relax_disp.parameters import get_param_names, 
get_value, loop_parameters, param_index_to_param_info, param_num
+from specific_analyses.relax_disp.parameters import get_param_names, 
get_value, loop_parameters, param_index_to_param_info, param_num, r1_setup
 from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_PROTON_MQ, 
EXP_TYPE_CPMG_PROTON_SQ, MODEL_LIST_MMQ, MODEL_R2EFF, PARAMS_R20
 
 
@@ -456,6 +456,9 @@
         # No spins.
         if not len(spins):
             return None
+
+        # Set up the R1 parameter, if needed.
+        r1_setup()
 
         # Loop over the parameters of the cluster, fetching their values.
         values = []