Author: bugman
Date: Fri Aug 22 11:12:13 2014
New Revision: 25196
URL: http://svn.gna.org/viewcvs/relax?rev=25196&view=rev
Log:
Merged revisions 25193 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r25193 | bugman | 2014-08-22 09:07:33 +0200 (Fri, 22 Aug 2014) | 14 lines
Fix for the return_r2eff_arrays() dispersion function for exponential
curves.
This is a partial solution for bug #22461 (https://gna.org/bugs/?22461).
For the Relax_disp.test_r1rho_kjaergaard_missing_r1 system test, there are
multiple relaxation times
for each data set. For example, printing out the exp_type, frq, offset,
point, ei, mi, oi, di, and
relax_times data gives:
- R1rho 799777399.1 118.078 431.0 0 0 0 0 [0.0, 0.04, 0.1, 0.2]
- R1rho 799777399.1 118.078 651.2 0 0 0 1 [0.0, 0.04, 0.1, 0.2, 0.4]
Instead of taking the first relaxation time of 0.0, now the maximum time is
taken.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 22 11:12:13 2014
@@ -1 +1 @@
-/trunk:1-25186,25188-25191
+/trunk:1-25194
Modified: branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/data.py?rev=25196&r1=25195&r2=25196&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_disp/data.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/relax_disp/data.py Fri
Aug 22 11:12:13 2014
@@ -4365,7 +4365,6 @@
# Loop over the R2eff data.
for exp_type, frq, offset, point, ei, mi, oi, di in
loop_exp_frq_offset_point(return_indices=True):
-
# Alias the correct spin.
current_spin = spin
if exp_type in [EXP_TYPE_CPMG_PROTON_SQ,
EXP_TYPE_CPMG_PROTON_MQ]:
@@ -4406,6 +4405,7 @@
errors[ei][si][mi][oi].append(current_spin.r2eff_err[key])
# The relaxation times.
+ relax_time = []
for id in cdp.spectrum_ids:
# Non-matching data.
if cdp.spectrometer_frq[id] != frq:
@@ -4420,8 +4420,10 @@
continue
# Found.
- relax_time = cdp.relax_times[id]
- break
+ relax_time.append(cdp.relax_times[id])
+
+ # Use the maximum time value found.
+ relax_time = max(relax_time)
# Check the value if already set.
if relax_times[ei][mi] != None:
r25196 - in /branches/frame_order_cleanup: ./ specific_analyses/relax_disp/data.py