r24037 - in /branches/disp_spin_speed: ./ lib/dispersion/lm63_3site.py -- June 17, 2014 - 14:57

Author: tlinnet
Date: Tue Jun 17 14:57:33 2014
New Revision: 24037

URL: http://svn.gna.org/viewcvs/relax?rev=24037&view=rev
Log:
Merged revisions 24028 via svnmerge from 
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk

........
  r24028 | bugman | 2014-06-17 14:03:14 +0200 (Tue, 17 Jun 2014) | 6 lines
  
  Fix for bug #22210 (https://gna.org/bugs/?22210), the failure of the 'LM63 
3-site' dispersion model.
  
  The problem is described in the bug report - the multiplication in the 
tanh() function is a mistake,
  it must be a division.
........

Modified:
    branches/disp_spin_speed/   (props changed)
    branches/disp_spin_speed/lib/dispersion/lm63_3site.py

Propchange: branches/disp_spin_speed/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 17 14:57:33 2014
@@ -1 +1 @@
-/trunk:1-24024
+/trunk:1-24036

Modified: branches/disp_spin_speed/lib/dispersion/lm63_3site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/lm63_3site.py?rev=24037&r1=24036&r2=24037&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/lm63_3site.py       (original)
+++ branches/disp_spin_speed/lib/dispersion/lm63_3site.py       Tue Jun 17 
14:57:33 2014
@@ -104,5 +104,5 @@
         # The full formula.
         else:
             back_calc[i] = r20
-            back_calc[i] += rex_B * (1.0 - cpmg_frqs[i] * tanh(quart_kB * 
cpmg_frqs[i]) / quart_kB)
-            back_calc[i] += rex_C * (1.0 - cpmg_frqs[i] * tanh(quart_kC * 
cpmg_frqs[i]) / quart_kC)
+            back_calc[i] += rex_B * (1.0 - cpmg_frqs[i] * tanh(quart_kB / 
cpmg_frqs[i]) / quart_kB)
+            back_calc[i] += rex_C * (1.0 - cpmg_frqs[i] * tanh(quart_kC / 
cpmg_frqs[i]) / quart_kC)