r22936 - in /trunk: docs/latex/dispersion.tex lib/dispersion/cr72.py -- May 03, 2014 - 15:21

Author: tlinnet
Date: Sat May  3 15:21:20 2014
New Revision: 22936

URL: http://svn.gna.org/viewcvs/relax?rev=22936&view=rev
Log:
Fix for type in the eta scale of CR72 model.

The calculation in relax was correct, but the scale of eta has been wrong in 
the documentation.

This was discussed in:
http://thread.gmane.org/gmane.science.nmr.relax.devel/5506.

The B14 model is explained in: http://wiki.nmr-relax.com/B14.

Modified:
    trunk/docs/latex/dispersion.tex
    trunk/lib/dispersion/cr72.py

Modified: trunk/docs/latex/dispersion.tex
URL: 
http://svn.gna.org/viewcvs/relax/trunk/docs/latex/dispersion.tex?rev=22936&r1=22935&r2=22936&view=diff
==============================================================================
--- trunk/docs/latex/dispersion.tex     (original)
+++ trunk/docs/latex/dispersion.tex     Sat May  3 15:21:20 2014
@@ -427,7 +427,7 @@
 where
 \begin{align}
     D_\pm    &= \frac{1}{2} \left( \pm1 + \frac{\Psi + 2\dw^2}{\sqrt{\Psi^2 
+ \zeta^2}} \right) , \\
-    \eta_\pm &= 2^{\frac{2}{3}}\frac{1}{\nucpmg} \left( \pm\Psi + 
\sqrt{\Psi^2 + \zeta^2} \right)^{\frac{1}{2}} , \\
+    \eta_\pm &= 2^{\frac{-3}{2}}\frac{1}{\nucpmg} \left( \pm\Psi + 
\sqrt{\Psi^2 + \zeta^2} \right)^{\frac{1}{2}} , \\
     \Psi     &= \left( \RtwozeroA - \RtwozeroB - \pA\kex + \pB\kex \right)^2 
- \dw^2 + 4\pA\pB\kex^2 , \\
     \zeta    &= 2\dw \left( \RtwozeroA - \RtwozeroB - \pA\kex + \pB\kex 
\right).
 \end{align}

Modified: trunk/lib/dispersion/cr72.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/cr72.py?rev=22936&r1=22935&r2=22936&view=diff
==============================================================================
--- trunk/lib/dispersion/cr72.py        (original)
+++ trunk/lib/dispersion/cr72.py        Sat May  3 15:21:20 2014
@@ -50,9 +50,9 @@
     D+/- = - | +/-1 + -------------------- | ,
            2 \        sqrt(Psi^2 + zeta^2) /
 
-             2^(2/3)
-    eta+/- = ------- sqrt(+/-Psi + sqrt(Psi^2 + zeta^2)) ,
-             nu_cpmg
+                           1
+    eta+/- = 2^(-3/2) . -------- sqrt(+/-Psi + sqrt(Psi^2 + zeta^2)) ,
+                        nu_cpmg
 
     Psi = (R2A0 - R2B0 - pA.kex + pB.kex)^2 - delta_omega^2 + 4pA.pB.kex^2 ,