Author: tlinnet Date: Fri Mar 7 13:21:28 2014 New Revision: 22437 URL: http://svn.gna.org/viewcvs/relax?rev=22437&view=rev Log: Fixed unpacking of return from function calls of return_offset_data. Regarding sr #3124, (https://gna.org/support/index.php?3124) - Grace graphs production for R1rho analysis with R2_eff as function of Omega_eff. Modified: trunk/lib/rotating_frame.py trunk/sample_scripts/relax_disp/return_offset_data.py trunk/specific_analyses/relax_disp/optimisation.py trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py Modified: trunk/lib/rotating_frame.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/rotating_frame.py?rev=22437&r1=22436&r2=22437&view=diff ============================================================================== --- trunk/lib/rotating_frame.py (original) +++ trunk/lib/rotating_frame.py Fri Mar 7 13:21:28 2014 @@ -69,7 +69,7 @@ cur_spins.append(curspin) # The offset and R1 data. - chemical_shifts, offsets, tilt_angles = return_offset_data(spins=cur_spins, spin_ids=cur_spin_ids, field_count=field_count, fields=spin_lock_nu1) + chemical_shifts, offsets, tilt_angles, Delta_omega = return_offset_data(spins=cur_spins, spin_ids=cur_spin_ids, field_count=field_count, fields=spin_lock_nu1) # Loop over the index of spins, then exp_type, frq, offset print("Printing the following") Modified: trunk/sample_scripts/relax_disp/return_offset_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/relax_disp/return_offset_data.py?rev=22437&r1=22436&r2=22437&view=diff ============================================================================== --- trunk/sample_scripts/relax_disp/return_offset_data.py (original) +++ trunk/sample_scripts/relax_disp/return_offset_data.py Fri Mar 7 13:21:28 2014 @@ -52,7 +52,7 @@ cur_spins.append(curspin) # The offset and R1 data. - chemical_shifts, offsets, tilt_angles = return_offset_data(spins=cur_spins, spin_ids=cur_spin_ids, field_count=field_count, fields=spin_lock_nu1) + chemical_shifts, offsets, tilt_angles, Delta_omega = return_offset_data(spins=cur_spins, spin_ids=cur_spin_ids, field_count=field_count, fields=spin_lock_nu1) # Loop over the index of spins, then exp_type, frq, offset print("Printing the following") Modified: trunk/specific_analyses/relax_disp/optimisation.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/optimisation.py?rev=22437&r1=22436&r2=22437&view=diff ============================================================================== --- trunk/specific_analyses/relax_disp/optimisation.py (original) +++ trunk/specific_analyses/relax_disp/optimisation.py Fri Mar 7 13:21:28 2014 @@ -79,7 +79,7 @@ values, errors, missing, frqs, frqs_H, exp_types, relax_times = return_r2eff_arrays(spins=[spin], spin_ids=[spin_id], fields=fields, field_count=field_count) # The offset and R1 data. - chemical_shifts, offsets, tilt_angles = return_offset_data(spins=[spin], spin_ids=[spin_id], field_count=field_count, fields=spin_lock_nu1) + chemical_shifts, offsets, tilt_angles, Delta_omega = return_offset_data(spins=[spin], spin_ids=[spin_id], field_count=field_count, fields=spin_lock_nu1) r1 = return_r1_data(spins=[spin], spin_ids=[spin_id], field_count=field_count) # The dispersion data. @@ -403,7 +403,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. - self.chemical_shifts, self.offsets, self.tilt_angles = return_offset_data(spins=spins, spin_ids=spin_ids, field_count=len(fields)) + self.chemical_shifts, self.offsets, self.tilt_angles, self.Delta_omega = 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) # Parameter number. Modified: trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22437&r1=22436&r2=22437&view=diff ============================================================================== --- trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py (original) +++ trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py Fri Mar 7 13:21:28 2014 @@ -723,7 +723,7 @@ g15N = -2.7126 * 1e7 # The offset and R1 data. - chemical_shifts, offsets, tilt_angles = return_offset_data(spins=cur_spins, spin_ids=cur_spin_ids, field_count=field_count, fields=spin_lock_nu1) + chemical_shifts, offsets, tilt_angles, Delta_omega = return_offset_data(spins=cur_spins, spin_ids=cur_spin_ids, field_count=field_count, fields=spin_lock_nu1) # Loop over the index of spins, then exp_type, frq, offset print("Printing the following")