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

Author: tlinnet
Date: Wed May  7 15:54:51 2014
New Revision: 23049

URL: http://svn.gna.org/viewcvs/relax?rev=23049&view=rev
Log:
Replaved "oGt2" with "v4" 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=23049&r1=23048&r2=23049&view=diff
==============================================================================
--- trunk/lib/dispersion/b14.py (original)
+++ trunk/lib/dispersion/b14.py Wed May  7 15:54:51 2014
@@ -192,7 +192,7 @@
     t1pt2 = (2. * dw2 + zeta*1j) / NNc
 
     # -2 * oG * t2.
-    oGt2 = t2 * (-alpha_m - g3 ) + t2 * (dw - g4)*1j
+    v4 = t2 * (-alpha_m - g3 ) + t2 * (dw - g4)*1j
 
     # -1/Trel * log(LpreDyn).
     Rpre = (r20a + r20b + kex) / 2.0
@@ -222,7 +222,7 @@
     y = power( (v1c - v3) / (v1c + v3), ncyc)
 
     # Off diagonal common factor. sinh fuctions.
-    v5 = (-deltaR2 + kex + dw*1j) * v1s - 2. * (oGt2 + k_AB * t1pt2) * ex1c
+    v5 = (-deltaR2 + kex + dw*1j) * v1s - 2. * (v4 + k_AB * t1pt2) * ex1c
 
     Tog = 0.5 * (1. + y) + (1. - y) * v5 / (2. * v3 * N )