r23955 - /branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py -- June 15, 2014 - 08:53

Author: tlinnet
Date: Sun Jun 15 08:53:44 2014
New Revision: 23955

URL: http://svn.gna.org/viewcvs/relax?rev=23955&view=rev
Log:
Turned Mint vector into a 7,1 matrix, so dimensions fit with evolution 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=23955&r1=23954&r2=23955&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 Sun Jun 15 
08:53:44 2014
@@ -132,7 +132,7 @@
     # Loop over the time points, back calculating the R2eff values.
     for i in range(num_points):
         # Initial magnetisation.
-        Mint = M0
+        Mint = M0.reshape(7, 1)
 
         # This matrix is a propagator that will evolve the magnetization 
with the matrix R for a delay tcp.
         Rexpo = matrix_exponential(R*tcp[i])
@@ -145,7 +145,7 @@
             Mint = t_mat.dot(Mint)
 
         # The next lines calculate the R2eff using a two-point 
approximation, i.e. assuming that the decay is mono-exponential.
-        Mx = Mint[1] / pA
+        Mx = Mint[1][0] / pA
         if Mx <= 0.0 or isNaN(Mx):
             back_calc[i] = r20a
         else: