r24228 - in /branches/disp_spin_speed/lib/dispersion: ns_matrices.py ns_r1rho_3site.py -- June 20, 2014 - 20:07

Author: tlinnet
Date: Fri Jun 20 20:07:16 2014
New Revision: 24228

URL: http://svn.gna.org/viewcvs/relax?rev=24228&view=rev
Log:
Removed pA, pB and pC from the matrice population function 
rr1rho_3d_3site_rankN, since they are not used.

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_matrices.py
    branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_matrices.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_matrices.py?rev=24228&r1=24227&r2=24228&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_matrices.py      (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_matrices.py      Fri Jun 20 
20:07:16 2014
@@ -972,19 +972,13 @@
     matrix[8, 5] = k_BC
 
 
-def rr1rho_3d_3site_rankN(R1=None, r1rho_prime=None, pA=None, pB=None, 
pC=None, dw_AB=None, dw_AC=None, omega=None, offset=None, w1=None, k_AB=None, 
k_BA=None, k_BC=None, k_CB=None, k_AC=None, k_CA=None, relax_time=None):
+def rr1rho_3d_3site_rankN(R1=None, r1rho_prime=None, dw_AB=None, dw_AC=None, 
omega=None, offset=None, w1=None, k_AB=None, k_BA=None, k_BC=None, k_CB=None, 
k_AC=None, k_CA=None, relax_time=None):
     """Definition of the 3D exchange matrix.
 
     @keyword R1:            The longitudinal, spin-lattice relaxation rate.
     @type R1:               numpy float array of rank [NE][NS][NM][NO][ND]
     @keyword r1rho_prime:   The R1rho transverse, spin-spin relaxation rate 
in the absence of exchange.
     @type r1rho_prime:      numpy float array of rank [NE][NS][NM][NO][ND]
-    @keyword pA:            The population of state A.
-    @type pA:               float
-    @keyword pB:            The population of state B.
-    @type pB:               float
-    @keyword pC:            The population of state C.
-    @type pC:               float
     @keyword omega:         The chemical shift for the spin in rad/s.
     @type omega:            numpy float array of rank [NS][NM][NO][ND]
     @keyword offset:        The spin-lock offsets for the data.

Modified: branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py?rev=24228&r1=24227&r2=24228&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py   (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_r1rho_3site.py   Fri Jun 20 
20:07:16 2014
@@ -124,7 +124,7 @@
     NE, NS, NM, NO = num_points.shape
 
     # The matrix that contains all the contributions to the evolution, i.e. 
relaxation, exchange and chemical shift evolution.
-    R_mat = rr1rho_3d_3site_rankN(R1=r1, r1rho_prime=r1rho_prime, pA=pA, 
pB=pB, pC=pC, dw_AB=dw_AB, dw_AC=dw_AC, omega=omega, offset=offset, 
w1=spin_lock_fields, k_AB=k_AB, k_BA=k_BA, k_BC=k_BC, k_CB=k_CB, k_AC=k_AC, 
k_CA=k_CA, relax_time=relax_time)
+    R_mat = rr1rho_3d_3site_rankN(R1=r1, r1rho_prime=r1rho_prime, 
omega=omega, offset=offset, dw_AB=dw_AB, dw_AC=dw_AC, w1=spin_lock_fields, 
k_AB=k_AB, k_BA=k_BA, k_BC=k_BC, k_CB=k_CB, k_AC=k_AC, k_CA=k_CA, 
relax_time=relax_time)
 
     # This matrix is a propagator that will evolve the magnetization with 
the matrix R.
     Rexpo_mat = matrix_exponential_rankN(R_mat)