r25144 - /trunk/specific_analyses/relax_disp/optimisation.py -- August 21, 2014 - 09:57

Author: bugman
Date: Thu Aug 21 09:57:23 2014
New Revision: 25144

URL: http://svn.gna.org/viewcvs/relax?rev=25144&view=rev
Log:
The specific_analyses.relax_disp.parameters.r1_setup() function is now being 
called.

This happens before the R1 data is returned in the Disp_minimise_command 
class.

Modified:
    trunk/specific_analyses/relax_disp/optimisation.py

Modified: trunk/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/optimisation.py?rev=25144&r1=25143&r2=25144&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/optimisation.py  (original)
+++ trunk/specific_analyses/relax_disp/optimisation.py  Thu Aug 21 09:57:23 
2014
@@ -40,7 +40,7 @@
 from pipe_control.mol_res_spin import spin_loop
 from specific_analyses.relax_disp.checks import check_disp_points, 
check_exp_type, check_exp_type_fixed_time
 from specific_analyses.relax_disp.data import average_intensity, 
count_spins, find_intensity_keys, has_exponential_exp_type, 
has_proton_mmq_cpmg, is_r1_optimised, loop_exp, loop_exp_frq_offset_point, 
loop_exp_frq_offset_point_time, loop_frq, loop_offset, loop_time, 
pack_back_calc_r2eff, return_cpmg_frqs, return_offset_data, 
return_param_key_from_data, return_r1_data, return_r2eff_arrays, 
return_spin_lock_nu1
-from specific_analyses.relax_disp.parameters import assemble_param_vector, 
disassemble_param_vector, linear_constraints, param_conversion, param_num
+from specific_analyses.relax_disp.parameters import assemble_param_vector, 
disassemble_param_vector, linear_constraints, param_conversion, param_num, 
r1_setup
 from specific_analyses.relax_disp.variables import EXP_TYPE_LIST_CPMG, 
MODEL_CR72, MODEL_CR72_FULL, MODEL_LIST_MMQ, MODEL_LM63, MODEL_M61, 
MODEL_MP05, MODEL_TAP03, MODEL_TP02
 from target_functions.relax_disp import Dispersion
 
@@ -560,6 +560,7 @@
         self.values, self.errors, self.missing, self.frqs, self.frqs_H, 
self.exp_types, self.relax_times = return_r2eff_arrays(spins=spins, 
spin_ids=spin_ids, fields=fields, field_count=len(fields), 
sim_index=sim_index)
 
         # The offset and R1 data.
+        r1_setup()
         self.offsets, spin_lock_fields_inter, self.chemical_shifts, 
self.tilt_angles, self.Delta_omega, self.w_eff = 
return_offset_data(spins=spins, spin_ids=spin_ids, field_count=len(fields))
         self.r1 = return_r1_data(spins=spins, spin_ids=spin_ids, 
field_count=len(fields), sim_index=sim_index)
         self.r1_fit = is_r1_optimised(spins[0].model)