r23968 - /branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_3d.py -- June 15, 2014 - 22:59

Author: tlinnet
Date: Sun Jun 15 22:59:15 2014
New Revision: 23968

URL: http://svn.gna.org/viewcvs/relax?rev=23968&view=rev
Log:
Inner product fix in model NS CPMG 2site 3D.

Fix for system tests:
F     1.34 s for Relax_disp.test_cpmg_synthetic_ns3d_to_b14
F     0.78 s for Relax_disp.test_cpmg_synthetic_ns3d_to_cr72
F     3.74 s for Relax_disp.test_cpmg_synthetic_ns3d_to_cr72_noise_cluster

The number of dotting with Mint, should corespond to the power.

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=23968&r1=23967&r2=23968&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 
22:59:15 2014
@@ -164,11 +164,9 @@
                 dot(evolution_matrix * 1.0, Rexpo, evolution_matrix)
                 # The second round.
                 dot(evolution_matrix * 1.0, evolution_matrix * 1.0, 
evolution_matrix)
-                # The third and fourth round,
-                dot(evolution_matrix * 1.0, evolution_matrix * 1.0, 
evolution_matrix)
 
                 # Loop over the CPMG elements, propagating the magnetisation.
-                for j in range(power_si_mi_di/2):
+                for j in range(power_si_mi_di):
                     Mint = dot(evolution_matrix, Mint)
 
                 # The next lines calculate the R2eff using a two-point 
approximation, i.e. assuming that the decay is mono-exponential.