r23045 - /trunk/lib/dispersion/b14.py -- May 07, 2014 - 15:54

Author: tlinnet
Date: Wed May  7 15:54:44 2014
New Revision: 23045

URL: http://svn.gna.org/viewcvs/relax?rev=23045&view=rev
Log:
Replaced f2 with F2, to follow manual and paper.

sr #3154: (https://gna.org/support/?3154) Implementation of Baldwin (2014) 
B14 model - 2-site exact solution model for all time scales.

This follows the tutorial for adding relaxation dispersion models at:
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax#Debugging

Modified:
    trunk/lib/dispersion/b14.py

Modified: trunk/lib/dispersion/b14.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/b14.py?rev=23045&r1=23044&r2=23045&view=diff
==============================================================================
--- trunk/lib/dispersion/b14.py (original)
+++ trunk/lib/dispersion/b14.py Wed May  7 15:54:44 2014
@@ -180,8 +180,8 @@
     # F0.
     F0 = (dw2 + g32) / NNc
 
-    # f2.
-    f2 = (dw2 - g42) / NNc
+    # F2.
+    F2 = (dw2 - g42) / NNc
 
     # t1 = (-dw + g4) * (complex(-dw, -g3)) / NNc #t1.
 
@@ -208,10 +208,10 @@
     E1 = (g3 - g4*1j) * tcp
 
     # Real. The v_1c in paper.
-    v1c = F0 * cosh(E0) - f2 * cos(E2)
+    v1c = F0 * cosh(E0) - F2 * cos(E2)
 
     # Complex.
-    v1s = F0 * sinh(E0) - f2 * sin(E2)*1j
+    v1s = F0 * sinh(E0) - F2 * sin(E2)*1j
 
     # Complex.
     ex1c = sinh(E1)