Author: bugman
Date: Mon Jan 13 10:12:43 2014
New Revision: 21961
URL: http://svn.gna.org/viewcvs/relax?rev=21961&view=rev
Log:
Merged revisions 21957 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21957 | bugman | 2014-01-13 10:10:40 +0100 (Mon, 13 Jan 2014) | 9 lines
Fix for bug #21460, the failure of relaxation dispersion due to incorrect
spectrometer information.
This is the bug https://gna.org/bugs/?21460, reported by Min-Kyu Cho
(min-kyu dott cho att live dot
com).
There was only one place in the dispersion analysis which failed due to a
spectrometer frequency not
containing any relaxation data - in the insignificance testing in the
auto-analysis.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/specific_analyses/relax_disp/disp_data.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 13 10:12:43 2014
@@ -1,1 +1,1 @@
-/trunk:1-21956
+/trunk:1-21958
Modified: branches/double_rotor/specific_analyses/relax_disp/disp_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/disp_data.py?rev=21961&r1=21960&r2=21961&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/double_rotor/specific_analyses/relax_disp/disp_data.py Mon Jan
13 10:12:43 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2004-2013 Edward d'Auvergne
#
+# Copyright (C) 2004-2014 Edward d'Auvergne
#
# Copyright (C) 2009 Sebastien Morin
#
# Copyright (C) 2013 Troels E. Linnet
#
#
#
@@ -626,6 +626,10 @@
# Loop over the experiments, magnetic fields, and offsets.
max_diff = 0.0
for exp_type, frq, offset, ei, mi, oi in
loop_exp_frq_offset(return_indices=True):
+ # No data.
+ if not len(values[ei][0][mi][oi]):
+ continue
+
# The difference.
diff = values[ei][0][mi][oi].max() - values[ei][0][mi][oi].min()
r21961 - in /branches/double_rotor: ./ specific_analyses/relax_disp/disp_data.py