r24182 - /branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py -- June 20, 2014 - 08:19

Author: tlinnet
Date: Fri Jun 20 08:19:20 2014
New Revision: 24182

URL: http://svn.gna.org/viewcvs/relax?rev=24182&view=rev
Log:
Rearranged the code, to properly show the nested matrix exponentials in dot 
functions.

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_star.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py?rev=24182&r1=24181&r2=24182&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py       
(original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py       Fri 
Jun 20 08:19:20 2014
@@ -203,9 +203,10 @@
                     print asd
 
                 eR_tcp = eR_mat[0, si, mi, 0, di]
+                ecR2_tcp = matrix_exponential(cR2_mat_i)
 
                 # This is the propagator for an element of [delay tcp; 180 
deg pulse; 2 times delay tcp; 180 deg pulse; delay tau], i.e. for 2 times 
tau-180-tau.
-                prop_2 = dot(dot(eR_tcp, matrix_exponential(cR2_mat_i)), 
eR_tcp)
+                prop_2 = dot(dot(eR_tcp, ecR2_tcp), eR_tcp)
 
                 # Now create the total propagator that will evolve the 
magnetization under the CPMG train, i.e. it applies the above 
tau-180-tau-tau-180-tau so many times as required for the CPMG frequency 
under consideration.
                 prop_total = square_matrix_power(prop_2, power_si_mi_di)