r24225 - in /branches/disp_spin_speed/lib/dispersion: ns_cpmg_2site_star.py ns_matrices.py -- June 20, 2014 - 20:03

Author: tlinnet
Date: Fri Jun 20 20:03:27 2014
New Revision: 24225

URL: http://svn.gna.org/viewcvs/relax?rev=24225&view=rev
Log:
Removed pA and pB from the matrice population function rcpmg_star_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_cpmg_2site_star.py
    branches/disp_spin_speed/lib/dispersion/ns_matrices.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py?rev=24225&r1=24224&r2=24225&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py       
(original)
+++ branches/disp_spin_speed/lib/dispersion/ns_cpmg_2site_star.py       Fri 
Jun 20 20:03:27 2014
@@ -63,7 +63,7 @@
 # relax module imports.
 from lib.float import isNaN
 from lib.dispersion.ns_matrices import rcpmg_star_rankN
-from lib.linear_algebra.matrix_exponential import matrix_exponential, 
matrix_exponential_rankN
+from lib.linear_algebra.matrix_exponential import matrix_exponential_rankN
 from lib.linear_algebra.matrix_power import square_matrix_power
 
 
@@ -125,7 +125,7 @@
     NE, NS, NM, NO, ND = back_calc.shape
 
     # The matrix R that contains all the contributions to the evolution, 
i.e. relaxation, exchange and chemical shift evolution.
-    R_mat, cR2_mat, Rr_mat, Rex_mat, RCS_mat = rcpmg_star_rankN(R2A=r20a, 
R2B=r20b, pA=pA, pB=pB, dw=dw, k_AB=k_AB, k_BA=k_BA, tcp=tcp)
+    R_mat, cR2_mat, Rr_mat, Rex_mat, RCS_mat = rcpmg_star_rankN(R2A=r20a, 
R2B=r20b, dw=dw, k_AB=k_AB, k_BA=k_BA, tcp=tcp)
 
     eR_mat = matrix_exponential_rankN(R_mat)
     ecR2_mat = matrix_exponential_rankN(cR2_mat)

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=24225&r1=24224&r2=24225&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:03:27 2014
@@ -321,17 +321,13 @@
     return c_mat
 
 
-def rcpmg_star_rankN(R2A=None, R2B=None, pA=None, pB=None, dw=None, 
k_AB=None, k_BA=None, tcp=None):
+def rcpmg_star_rankN(R2A=None, R2B=None, dw=None, k_AB=None, k_BA=None, 
tcp=None):
     """Definition of the exchange matrix, for rank 
[NE][NS][NM][NO][ND][2][2].
 
     @keyword R2A:   The transverse, spin-spin relaxation rate for state A.
     @type R2A:      numpy float array of rank [NE][NS][NM][NO][ND]
     @keyword R2B:   The transverse, spin-spin relaxation rate for state B.
     @type R2B:      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 dw:    The chemical exchange difference between states A and B 
in rad/s.
     @type dw:       numpy float array of rank [NE][NS][NM][NO][ND]
     @keyword k_AB:  The forward exchange rate from state A to state B.