Author: tlinnet
Date: Thu May 22 14:59:45 2014
New Revision: 23332
URL: http://svn.gna.org/viewcvs/relax?rev=23332&view=rev
Log:
Merged revisions 23331 via svnmerge from
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk
........
r23331 | bugman | 2014-05-22 14:52:08 +0200 (Thu, 22 May 2014) | 10 lines
Fix for all edge case 'no Rex' failures of the 'NS CPMG 2-site expanded'
model.
This uses the no exchange checking idea, modified to function in the relax
trunk, from
http://article.gmane.org/gmane.science.nmr.relax.devel/5847. This is
importantly on line 1 of the
function.
The recently introduced set of 7 unit tests (r23327) comprehensively
showing these failures now all
pass. This commit is mainly for demonstration purposes.
........
Modified:
branches/disp_speed/ (props changed)
branches/disp_speed/lib/dispersion/ns_cpmg_2site_expanded.py
Propchange: branches/disp_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 22 14:59:45 2014
@@ -1 +1 @@
-/trunk:1-23329
+/trunk:1-23331
Modified: branches/disp_speed/lib/dispersion/ns_cpmg_2site_expanded.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_speed/lib/dispersion/ns_cpmg_2site_expanded.py?rev=23332&r1=23331&r2=23332&view=diff
==============================================================================
--- branches/disp_speed/lib/dispersion/ns_cpmg_2site_expanded.py
(original)
+++ branches/disp_speed/lib/dispersion/ns_cpmg_2site_expanded.py Thu
May 22 14:59:45 2014
@@ -269,6 +269,12 @@
@type num_cpmg: numpy int16, rank-1 array
"""
+ # Catch parameter values that will result in no exchange, returning flat
R2eff = R20 lines (when kex = 0.0, k_AB = 0.0).
+ if dw == 0.0 or pA == 1.0 or k_AB == 0.0:
+ for i in range(num_points):
+ back_calc[i] = r20
+ return
+
# Repeditive calculations.
half_tcp = 0.5 * tcp
k_AB_plus_k_BA = k_AB + k_BA
r23332 - in /branches/disp_speed: ./ lib/dispersion/ns_cpmg_2site_expanded.py