r24177 - /branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py -- June 20, 2014 - 08:11

Author: tlinnet
Date: Fri Jun 20 08:11:51 2014
New Revision: 24177

URL: http://svn.gna.org/viewcvs/relax?rev=24177&view=rev
Log:
Started using the newly created multidimensional matrix.

test_hansen_cpmg_data_to_ns_cpmg_2site_star

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=24177&r1=24176&r2=24177&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:11:51 2014
@@ -176,6 +176,7 @@
                 # This matrix is a propagator that will evolve the 
magnetization with the matrix R for a delay tcp.
                 R_tcp = R*tcp_si_mi_di
                 R_mat_i = R_mat[0, si, mi, 0, di]
+                cR2_mat_i = cR2_mat[0, si, mi, 0, di]
 
                 # Insert check
                 diff = R_tcp.real -R_mat_i.real
@@ -199,7 +200,7 @@
                     print tcp_si_mi_di - tcp[0, si, mi, 0, di]
                     print asd
 
-                eR_tcp = matrix_exponential(R_tcp)
+                eR_tcp = matrix_exponential(R_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*tcp_si_mi_di)), eR_tcp)