r24159 - /branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py -- June 19, 2014 - 17:42

Author: tlinnet
Date: Thu Jun 19 17:42:14 2014
New Revision: 24159

URL: http://svn.gna.org/viewcvs/relax?rev=24159&view=rev
Log:
Made notation consistent for variables, using "_i" to clarify extracted data 
from matrix.

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

Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py?rev=24159&r1=24158&r2=24159&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py Thu Jun 19 
17:42:14 2014
@@ -155,7 +155,7 @@
                 r20a_si_mi_di = r20a[0, si, mi, 0, di]
 
                 # Initial magnetisation.
-                Mint = Mint_mat[0, si, mi, 0, di]
+                Mint_i = Mint_mat[0, si, mi, 0, di]
 
                 # This matrix is a propagator that will evolve the 
magnetization with the matrix R for a delay tcp.
                 Rexpo_i = Rexpo_mat[0, si, mi, 0, di]
@@ -163,17 +163,17 @@
 
                 # The essential evolution matrix.
                 # This is the first round.
-                evolution_matrix = dot(Rexpo_i, r180x_i)
-                evolution_matrix = dot(evolution_matrix, Rexpo_i)
+                evolution_matrix_i = dot(Rexpo_i, r180x_i)
+                evolution_matrix_i = dot(evolution_matrix_i, Rexpo_i)
                 # The second round.
-                evolution_matrix = dot(evolution_matrix, evolution_matrix )
+                evolution_matrix_i = dot(evolution_matrix_i, 
evolution_matrix_i )
 
                 # Loop over the CPMG elements, propagating the magnetisation.
                 for j in range(power_si_mi_di):
-                    Mint = dot(evolution_matrix, Mint)
+                    Mint_i = dot(evolution_matrix_i, Mint_i)
 
                 # The next lines calculate the R2eff using a two-point 
approximation, i.e. assuming that the decay is mono-exponential.
-                Mx = Mint[1][0] / pA
+                Mx = Mint_i[1][0] / pA
                 if Mx <= 0.0 or isNaN(Mx):
                     back_calc[0, si, mi, 0, di] = r20a_si_mi_di
                 else: