Author: tlinnet
Date: Fri Jun 13 10:33:44 2014
New Revision: 23911
URL: http://svn.gna.org/viewcvs/relax?rev=23911&view=rev
Log:
Fix for sending in r1rho_prime and phi_ex_scaled as numpy array in unit tests
of model M61.
Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion
models for Clustered analysis.
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_m61.py
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_m61.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_m61.py?rev=23911&r1=23910&r2=23911&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_m61.py
(original)
+++
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_m61.py
Fri Jun 13 10:33:44 2014
@@ -21,7 +21,7 @@
###############################################################################
# Python module imports.
-from numpy import array, float64, int16, pi, zeros
+from numpy import array, float64, int16, ones, pi, zeros
from unittest import TestCase
# relax module imports.
@@ -62,9 +62,10 @@
# Parameter conversions.
phi_ex_scaled, spin_lock_omega1_squared =
self.param_conversion(pA=self.pA, dw=self.dw, sfrq=self.sfrq,
spin_lock_nu1=self.spin_lock_nu1)
+ a = ones([self.num_points])
+
# Calculate the R1rho values.
- r1rho_M61(r1rho_prime=self.r1rho_prime, phi_ex=phi_ex_scaled,
kex=self.kex, spin_lock_fields2=spin_lock_omega1_squared,
back_calc=self.R1rho, num_points=self.num_points)
-
+ r1rho_M61(r1rho_prime=self.r1rho_prime*a, phi_ex=phi_ex_scaled*a,
kex=self.kex, spin_lock_fields2=spin_lock_omega1_squared,
back_calc=self.R1rho, num_points=self.num_points)
# Check all R1rho values.
if self.kex > 1.e5:
r23911 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_m61.py