Author: tlinnet Date: Fri Jun 20 10:54:07 2014 New Revision: 24197 URL: http://svn.gna.org/viewcvs/relax?rev=24197&view=rev Log: Reinserted old code. This fixes: test_korzhnev_2005_15n_mq_data 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_mmq_2site.py Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py?rev=24197&r1=24196&r2=24197&view=diff ============================================================================== --- branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py (original) +++ branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py Fri Jun 20 10:54:07 2014 @@ -239,17 +239,24 @@ # Loop over the time points, back calculating the R2eff values. for i in range(num_points_i): + m1_mat_i = m1_mat[si, mi, oi, i] + m2_mat_i = m2_mat[si, mi, oi, i] + # The M1 and M2 matrices. # Equivalent to D+. - M1_i = M1_mat[si, mi, oi, i] + #M1_i = M1_mat[si, mi, oi, i] + M1_i = matrix_exponential(m1_mat_i) # Equivalent to D+. # Equivalent to Z-. - M2_i = M1_mat[si, mi, oi, i] + #M2_i = M1_mat[si, mi, oi, i] + M2_i = matrix_exponential(m2_mat_i) # Equivalent to Z-. # The complex conjugates M1* and M2* # Equivalent to D+*. - M1_star_i = M1_mat_star[si, mi, oi, i] + #M1_star_i = M1_mat_star[si, mi, oi, i] + M1_star_i = conj(M1_i) # Equivalent to D+*. # Equivalent to Z-*. - M2_star_i = M2_mat_star[si, mi, oi, i] + #M2_star_i = M2_mat_star[si, mi, oi, i] + M2_star_i = conj(M2_i) # Equivalent to Z-*. # Repetitive dot products (minimised for speed). M1_M2 = dot(M1_i, M2_i)