r22967 - /trunk/lib/dispersion/b14.py -- May 05, 2014 - 20:18

Author: tlinnet
Date: Mon May  5 20:18:23 2014
New Revision: 22967

URL: http://svn.gna.org/viewcvs/relax?rev=22967&view=rev
Log:
Made g2 use the CR72 parameter convention.

No change detected, since the change will be erased by going to order**2.

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=22967&r1=22966&r2=22967&view=diff
==============================================================================
--- trunk/lib/dispersion/b14.py (original)
+++ trunk/lib/dispersion/b14.py Mon May  5 20:18:23 2014
@@ -149,7 +149,7 @@
     #########################################################################
     #get the real and imaginary components of the exchange induced shift
     g1=2*dw*(r20a-r20b+kge-keg)                   #same as carver richards 
zeta
-    g2=(deltaR2+keg-kge)**2+4*keg*kge-dw**2   #same as carver richards psi
+    g2=(r20a-r20b+kge-keg)**2+4*keg*kge-dw**2   #same as carver richards psi
     g3=1/sqrt(2)*sqrt(g2+sqrt(g1**2+g2**2))   #trig faster than square roots
     g4=1/sqrt(2)*sqrt(-g2+sqrt(g1**2+g2**2))   #trig faster than square roots
     #########################################################################