r21131 - /branches/relax_disp/lib/dispersion/mq_cr72.py -- October 16, 2013 - 10:43

Author: bugman
Date: Wed Oct 16 10:43:48 2013
New Revision: 21131

URL: http://svn.gna.org/viewcvs/relax?rev=21131&view=rev
Log:
The lib.dispersion.mq_cr72 module now more closely resembles the cr72 module 
in syntax.


Modified:
    branches/relax_disp/lib/dispersion/mq_cr72.py

Modified: branches/relax_disp/lib/dispersion/mq_cr72.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/mq_cr72.py?rev=21131&r1=21130&r2=21131&view=diff
==============================================================================
--- branches/relax_disp/lib/dispersion/mq_cr72.py (original)
+++ branches/relax_disp/lib/dispersion/mq_cr72.py Wed Oct 16 10:43:48 2013
@@ -69,8 +69,7 @@
     dw2 = dw**2
     r20_kex = r20 + kex/2.0
     pApBkex2 = k_AB * k_BA
-    sqrt_pApBkex2 = sqrt(pApBkex2)
-    isqrt_pApBkex2 = 1.j*sqrt_pApBkex2
+    isqrt_pApBkex2 = 1.j*sqrt(pApBkex2)
     sqrt_pBpA = sqrt(pB/pA)
     ikex = 1.j*kex
 
@@ -98,7 +97,7 @@
     Dneg = 0.5 * (-1.0 + D_part)
 
     # Partial eta+/- values.
-    eta_scale = sqrt(2.0)
+    eta_scale = 2.0**(-3.0/2.0)
     etapos_part = eta_scale * sqrt(Psi + sqrt_psi2_zeta2)
     etaneg_part = eta_scale * sqrt(-Psi + sqrt_psi2_zeta2)
 
@@ -108,8 +107,8 @@
         delta = tcp[i]
 
         # The full eta+/- values.
-        etapos = etapos_part * delta
-        etaneg = etaneg_part * delta
+        etapos = etapos_part / cpmg_frqs[i]
+        etaneg = etaneg_part / cpmg_frqs[i]
 
         # The mD value.
         mD = isqrt_pApBkex2 / (dpos * zpos) * (zpos + 
2.0*dw*sin(zpos*delta)/sin((dpos + zpos)*delta))