Author: tlinnet Date: Wed May 7 15:54:58 2014 New Revision: 23053 URL: http://svn.gna.org/viewcvs/relax?rev=23053&view=rev Log: Replaced "t1pt2" with "F1a_plus_b" for better reading. 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=23053&r1=23052&r2=23053&view=diff ============================================================================== --- trunk/lib/dispersion/b14.py (original) +++ trunk/lib/dispersion/b14.py Wed May 7 15:54:58 2014 @@ -189,7 +189,7 @@ F1b = (dw + g4) * (dw - g3*1j) / NNc # t1 + t2. - t1pt2 = (2. * dw2 + zeta*1j) / NNc + F1a_plus_b = (2. * dw2 + zeta*1j) / NNc # -2 * oG * t2. v4 = F1b * (-alpha_m - g3 ) + F1b * (dw - g4)*1j @@ -222,7 +222,7 @@ y = power( (v1c - v3) / (v1c + v3), ncyc) # Off diagonal common factor. sinh fuctions. - v5 = (-deltaR2 + kex + dw*1j) * v1s - 2. * (v4 + k_AB * t1pt2) * ex1c + v5 = (-deltaR2 + kex + dw*1j) * v1s - 2. * (v4 + k_AB * F1a_plus_b) * ex1c Tog = 0.5 * (1. + y) + (1. - y) * v5 / (2. * v3 * N )