r24628 - /branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py -- July 22, 2014 - 16:51

Author: tlinnet
Date: Tue Jul 22 16:51:42 2014
New Revision: 24628

URL: http://svn.gna.org/viewcvs/relax?rev=24628&view=rev
Log:
Code validation of lib/dispersion/ns_cpmg_2site_expanded.py.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py?rev=24628&r1=24627&r2=24628&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py   
(original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_expanded.py   Tue 
Jul 22 16:51:42 2014
@@ -74,9 +74,9 @@
     #tcp:=0.040/N;
     
     Ksym:=sqrt(Ka*Kb);
-    #dX:=(Ka-Kb+I*dw)/2;       # Ra=Rb
+    #dX:=(Ka-Kb+I*dw)/2;    # Ra=Rb
     dX:=((Ra-Rb)+(Ka-Kb)+I*dw)/2;
-    
+
     L:=([[-dX, Ksym], [Ksym, dX]]);
      
     # in the end everything is multiplied by 
exp(-0.5*(Ra+Rb+Ka+Kb)*(Tc+2*tpalmer))
@@ -117,7 +117,7 @@
     cGG:=evalm(GG2&*Pspalmer&*GG1);
     
     #s0:=array([Kb, Ka]);
-    s0:=array([sqrt(Kb),sqrt(Ka)]);    # accounts for exchange symmetrization
+    s0:=array([sqrt(Kb),sqrt(Ka)]); # accounts for exchange symmetrization
     st:=evalm(cGG&*s0);
     #obs:=(1/(Ka+Kb))*st[1];
     obs:=(sqrt(Kb)/(Ka+Kb))*st[1];  # accounts for exchange symmetrization