Author: bugman Date: Tue Jun 4 16:37:48 2013 New Revision: 19866 URL: http://svn.gna.org/viewcvs/relax?rev=19866&view=rev Log: Added support for the M61 model to the relax_disp.select_model user function back end. This is for the Meiboom 1961 2-site fast exchange model for R1rho-type experiments. Modified: branches/relax_disp/specific_analyses/relax_disp/__init__.py Modified: branches/relax_disp/specific_analyses/relax_disp/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/__init__.py?rev=19866&r1=19865&r2=19866&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp/__init__.py (original) +++ branches/relax_disp/specific_analyses/relax_disp/__init__.py Tue Jun 4 16:37:48 2013 @@ -58,7 +58,7 @@ from specific_analyses.api_common import API_common from specific_analyses.relax_disp.disp_data import average_intensity, find_intensity_keys, loop_cluster, loop_frq, loop_frq_point, loop_frq_point_key, loop_frq_point_time, loop_point, loop_time, relax_time, return_cpmg_frqs, return_index_from_disp_point, return_index_from_frq, return_key_from_disp_point_index, return_param_key_from_data, return_r2eff_arrays, return_spin_lock_nu1 from specific_analyses.relax_disp.parameters import assemble_param_vector, assemble_scaling_matrix, disassemble_param_vector, linear_constraints, param_index_to_param_info, param_num -from specific_analyses.relax_disp.variables import CPMG_EXP, FIXED_TIME_EXP, MODEL_LM63, MODEL_CR72, MODEL_NOREX, MODEL_R2EFF, R1RHO_EXP, VAR_TIME_EXP +from specific_analyses.relax_disp.variables import CPMG_EXP, FIXED_TIME_EXP, MODEL_LM63, MODEL_CR72, MODEL_M61, MODEL_NOREX, MODEL_R2EFF, R1RHO_EXP, VAR_TIME_EXP from target_functions.relax_disp import Dispersion from user_functions.data import Uf_tables; uf_tables = Uf_tables() from user_functions.objects import Desc_container @@ -781,7 +781,7 @@ def _select_model(self, model=MODEL_R2EFF): """Set up the model for the relaxation dispersion analysis. - @keyword model: The relaxation dispersion analysis type. This can be one of 'R2eff', 'No Rex', 'LM63', 'CR72'. + @keyword model: The relaxation dispersion analysis type. This can be one of 'R2eff', 'No Rex', 'LM63', 'CR72', 'M61'. @type model: str """ @@ -832,6 +832,14 @@ for i in range(cdp.spectrometer_frq_count): params.append('r2') params += ['pA', 'dw', 'kex'] + + # M61 model. + elif model == MODEL_M61: + print("The Meiboom (1961) 2-site fast exchange model for R1rho-type experiments.") + params = [] + for i in range(cdp.spectrometer_frq_count): + params.append('r2') + params += ['phi_ex', 'kex'] # Invalid model. else: