r23938 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_it99.py -- June 13, 2014 - 17:31

Author: tlinnet
Date: Fri Jun 13 17:31:33 2014
New Revision: 23938

URL: http://svn.gna.org/viewcvs/relax?rev=23938&view=rev
Log:
Fix for sending in r20 and dw as numpy array in unit tests of IT99.

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

Modified: 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_it99.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_it99.py?rev=23938&r1=23937&r2=23938&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_it99.py  
      (original)
+++ 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_it99.py  
      Fri Jun 13 17:31:33 2014
@@ -20,7 +20,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.
@@ -56,8 +56,10 @@
         # Parameter conversions.
         pB, dw_frq, tex = self.param_conversion(pA=self.pA, kex=self.kex, 
dw=self.dw, sfrq=self.sfrq)
 
+        a = ones([self.num_points])
+
         # Calculate the R2eff values.
-        r2eff_IT99(r20=self.r20, pA=self.pA, pB=pB, dw=dw_frq, tex=tex, 
cpmg_frqs=self.cpmg_frqs, back_calc=self.R2eff, num_points=self.num_points)
+        r2eff_IT99(r20=self.r20*a, pA=self.pA, dw=dw_frq*a, 
dw_orig=dw_frq*a, tex=tex, cpmg_frqs=self.cpmg_frqs, back_calc=self.R2eff)
 
         # Check all R2eff values.
         if self.kex > 1.e5: