Author: tlinnet Date: Fri Jun 13 13:03:22 2014 New Revision: 23933 URL: http://svn.gna.org/viewcvs/relax?rev=23933&view=rev Log: Fix for sending in r20 and phi_ex as numpy array in unit tests of LM63. This is after using masks as replacement. 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_lm63.py Modified: branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_lm63.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_lm63.py?rev=23933&r1=23932&r2=23933&view=diff ============================================================================== --- branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_lm63.py (original) +++ branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_lm63.py Fri Jun 13 13:03:22 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. @@ -55,8 +55,10 @@ # Parameter conversions. phi_ex_scaled = self.param_conversion(pA=self.pA, dw=self.dw, sfrq=self.sfrq) + a = ones([self.num_points]) + # Calculate the R2eff values. - R2eff = r2eff_LM63(r20=self.r20, phi_ex=phi_ex_scaled, kex=self.kex, cpmg_frqs=self.cpmg_frqs, back_calc=self.R2eff) + R2eff = r2eff_LM63(r20=self.r20*a, phi_ex=phi_ex_scaled*a, kex=self.kex, cpmg_frqs=self.cpmg_frqs, back_calc=self.R2eff) # Check all R2eff values. if self.kex > 1.e5: