r23927 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mp05.py -- June 13, 2014 - 12:16

Author: tlinnet
Date: Fri Jun 13 12:16:51 2014
New Revision: 23927

URL: http://svn.gna.org/viewcvs/relax?rev=23927&view=rev
Log:
Fix for sending in dw as numpy array in unit tests of model MP05.

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_mp05.py

Modified: 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mp05.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mp05.py?rev=23927&r1=23926&r2=23927&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mp05.py  
      (original)
+++ 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_mp05.py  
      Fri Jun 13 12:16:51 2014
@@ -21,7 +21,7 @@
 
###############################################################################
 
 # Python module imports.
-from numpy import arctan2, array, cos, float64, int16, pi, sin, zeros
+from numpy import arctan2, array, cos, float64, int16, ones, pi, sin, zeros
 from unittest import TestCase
 
 # relax module imports.
@@ -65,8 +65,10 @@
         # Parameter conversions.
         pB, dw_frq, spin_lock_omega1, 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 = r1rho_MP05(r1rho_prime=self.r1rho_prime, omega=self.omega, 
offset=self.offset, pA=self.pA, pB=pB, dw=dw_frq, kex=self.kex, R1=self.r1, 
spin_lock_fields=spin_lock_omega1, 
spin_lock_fields2=spin_lock_omega1_squared, back_calc=self.R1rho, 
num_points=self.num_points)
+        R1rho = r1rho_MP05(r1rho_prime=self.r1rho_prime, omega=self.omega, 
offset=self.offset, pA=self.pA, dw=dw_frq*a, kex=self.kex, R1=self.r1, 
spin_lock_fields=spin_lock_omega1, 
spin_lock_fields2=spin_lock_omega1_squared, back_calc=self.R1rho)
 
         # Compare to function value.
         # Larmor frequency [s^-1].