Author: tlinnet Date: Wed May 7 15:54:39 2014 New Revision: 23042 URL: http://svn.gna.org/viewcvs/relax?rev=23042&view=rev Log: Replaced f0 with F0, to follow paper and relax manual. 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=23042&r1=23041&r2=23042&view=diff ============================================================================== --- trunk/lib/dispersion/b14.py (original) +++ trunk/lib/dispersion/b14.py Wed May 7 15:54:39 2014 @@ -177,8 +177,8 @@ NNc = g32 + g42 - # f0. - f0 = (dw2 + g32) / NNc + # F0. + F0 = (dw2 + g32) / NNc # f2. f2 = (dw2 - g42) / NNc @@ -198,20 +198,20 @@ Rpre = (r20a + r20b + kex) / 2.0 # Derived from relaxation. - # E0 = -2.0 * tcp * (f00R - f11R). + # E0 = -2.0 * tcp * (F00R - f11R). E0 = two_tcp * g3 - # Derived from chemical shifts #E2 = complex(0,-2.0 * tcp * (f00I - f11I)). + # Derived from chemical shifts #E2 = complex(0,-2.0 * tcp * (F00I - f11I)). E2 = two_tcp * g4 # Mixed term (complex) (E0 - iE2)/2. E1 = (g3 - g4*1j) * tcp # Real. The v_1c in paper. - ex0b = f0 * cosh(E0) - f2 * cos(E2) + ex0b = F0 * cosh(E0) - f2 * cos(E2) # Complex. - ex0c = f0 * sinh(E0) - f2 * sin(E2)*1j + ex0c = F0 * sinh(E0) - f2 * sin(E2)*1j # Complex. ex1c = sinh(E1)