r24830 - /branches/r1rho_plotting/specific_analyses/relax_disp/optimisation.py -- July 30, 2014 - 13:30

Author: tlinnet
Date: Wed Jul 30 13:30:29 2014
New Revision: 24830

URL: http://svn.gna.org/viewcvs/relax?rev=24830&view=rev
Log:
Fix for output catching after re-order or return_offset_data() function.

sr #3124(https://gna.org/support/?3124): Grace graphs production for R1rho 
analysis with R2_eff as function of Omega_eff.
sr #3138(https://gna.org/support/?3138): Interpolating theta through 
spin-lock offset [Omega], rather than spin-lock field strength [w1].

Modified:
    branches/r1rho_plotting/specific_analyses/relax_disp/optimisation.py

Modified: branches/r1rho_plotting/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/r1rho_plotting/specific_analyses/relax_disp/optimisation.py?rev=24830&r1=24829&r2=24830&view=diff
==============================================================================
--- branches/r1rho_plotting/specific_analyses/relax_disp/optimisation.py      
  (original)
+++ branches/r1rho_plotting/specific_analyses/relax_disp/optimisation.py      
  Wed Jul 30 13:30:29 2014
@@ -147,7 +147,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, spin_lock_fields_inter, offsets, tilt_angles, 
Delta_omega, w_eff = return_offset_data(spins=[spin], spin_ids=[spin_id], 
field_count=field_count, spin_lock_offset=spin_lock_offset, 
fields=spin_lock_nu1)
+    offsets, spin_lock_fields_inter, chemical_shifts, tilt_angles, 
Delta_omega, w_eff = return_offset_data(spins=[spin], spin_ids=[spin_id], 
field_count=field_count, spin_lock_offset=spin_lock_offset, 
fields=spin_lock_nu1)
     r1 = return_r1_data(spins=[spin], spin_ids=[spin_id], 
field_count=field_count)
 
     # The dispersion data.
@@ -740,7 +740,8 @@
         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, spin_lock_fields_inter, self.offsets, 
self.tilt_angles, self.Delta_omega, self.w_eff = 
return_offset_data(spins=spins, spin_ids=spin_ids, field_count=len(fields))
+        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)
 
         # Parameter number.