Author: tlinnet
Date: Fri Jun 20 20:03:30 2014
New Revision: 24227
URL: http://svn.gna.org/viewcvs/relax?rev=24227&view=rev
Log:
Documentation fix for the dimensionality for model ns r1rho 2site.
The data is lined up to be of form [NE][NS][NM][NO][ND].
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_2site.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=24227&r1=24226&r2=24227&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:30 2014
@@ -765,11 +765,11 @@
@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 dw: The chemical exchange difference between states
A and B in rad/s.
- @type dw: numpy float array of rank [NS][NM][NO][ND]
+ @type dw: numpy float array of rank [NE][NS][NM][NO][ND]
@keyword omega: The chemical shift for the spin in rad/s.
- @type omega: numpy float array of rank [NS][NM][NO][ND]
+ @type omega: numpy float array of rank [NE][NS][NM][NO][ND]
@keyword offset: The spin-lock offsets for the data.
- @type offset: numpy float array of rank [NS][NM][NO][ND]
+ @type offset: numpy float array of rank [NE][NS][NM][NO][ND]
@keyword w1: The spin-lock field strength in rad/s.
@type w1: numpy float array of rank [NE][NS][NM][NO][ND]
@keyword k_AB: The forward exchange rate from state A to state
B.
@@ -779,7 +779,7 @@
@keyword k_BA: The reverse exchange rate from state B to state
A.
@type k_BA: float
@keyword relax_time: The total relaxation time period for each
spin-lock field strength (in seconds).
- @type relax_time: numpy float array of rank [NS][NM][NO][ND]
+ @type relax_time: numpy float array of rank [NE][NS][NM][NO][ND]
@return: The relaxation matrix.
@rtype: numpy float array of rank
[NE][NS][NM][NO][ND][6][6]
"""
Modified: branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py?rev=24227&r1=24226&r2=24227&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_r1rho_2site.py Fri Jun 20
20:03:30 2014
@@ -68,29 +68,29 @@
@keyword M0: This is a vector that contains the initial
magnetizations corresponding to the A and B state transverse magnetizations.
@type M0: numpy float64, rank-1, 7D array
@keyword r1rho_prime: The R1rho_prime parameter value (R1rho with
no exchange).
- @type r1rho_prime: numpy float array of rank [NS][NM][NO][ND]
+ @type r1rho_prime: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword omega: The chemical shift for the spin in rad/s.
- @type omega: numpy float array of rank [NS][NM][NO][ND]
+ @type omega: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword offset: The spin-lock offsets for the data.
- @type offset: numpy float array of rank [NS][NM][NO][ND]
+ @type offset: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword r1: The R1 relaxation rate.
- @type r1: numpy float array of rank [NS][NM][NO][ND]
+ @type r1: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword pA: The population of state A.
@type pA: float
@keyword dw: The chemical exchange difference between
states A and B in rad/s.
- @type dw: numpy float array of rank [NS][NM][NO][ND]
+ @type dw: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword kex: The kex parameter value (the exchange rate
in rad/s).
@type kex: float
@keyword spin_lock_fields: The R1rho spin-lock field strengths (in
rad.s^-1).
- @type spin_lock_fields: numpy float array of rank [NS][NM][NO][ND]
+ @type spin_lock_fields: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword relax_time: The total relaxation time period for each
spin-lock field strength (in seconds).
- @type relax_time: numpy float array of rank [NS][NM][NO][ND]
+ @type relax_time: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword inv_relax_time: The inverse of the relaxation time period
for each spin-lock field strength (in inverse seconds). This is used for
faster calculations.
- @type inv_relax_time: numpy float array of rank [NS][NM][NO][ND]
+ @type inv_relax_time: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword back_calc: The array for holding the back calculated
R2eff values. Each element corresponds to one of the CPMG nu1 frequencies.
- @type back_calc: numpy float array of rank [NS][NM][NO][ND]
+ @type back_calc: numpy float array of rank
[NE][NS][NM][NO][ND]
@keyword num_points: The number of points on the dispersion
curve, equal to the length of the tcp and back_calc arguments.
- @type num_points: numpy int array of rank [NS][NM][NO]
+ @type num_points: numpy int array of rank [NE][NS][NM][NO]
"""
# Once off parameter conversions.
r24227 - in /branches/disp_spin_speed/lib/dispersion: ns_matrices.py ns_r1rho_2site.py