r23916 - in /branches/disp_spin_speed: lib/dispersion/tsmfk01.py test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py -- June 13, 2014 - 11:17

Author: tlinnet
Date: Fri Jun 13 11:17:52 2014
New Revision: 23916

URL: http://svn.gna.org/viewcvs/relax?rev=23916&view=rev
Log:
Removed number of points to be send to lib function of model TTSMFK01.

These are not used anymore.
Also removed in corresponding unit tests.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/lib/dispersion/tsmfk01.py
    
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py

Modified: branches/disp_spin_speed/lib/dispersion/tsmfk01.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/tsmfk01.py?rev=23916&r1=23915&r2=23916&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/tsmfk01.py  (original)
+++ branches/disp_spin_speed/lib/dispersion/tsmfk01.py  Fri Jun 13 11:17:52 
2014
@@ -71,7 +71,7 @@
 from numpy.ma import fix_invalid, masked_where
 
 
-def r2eff_TSMFK01(r20a=None, dw=None, dw_orig=None, k_AB=None, tcp=None, 
back_calc=None, num_points=None):
+def r2eff_TSMFK01(r20a=None, dw=None, dw_orig=None, k_AB=None, tcp=None, 
back_calc=None):
     """Calculate the R2eff values for the TSMFK01 model.
 
     See the module docstring for details.
@@ -89,8 +89,6 @@
     @type tcp:              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 [NE][NS][[NM][NO][ND]
-    @keyword num_points:    The number of points on the dispersion curve, 
equal to the length of the cpmg_frqs and back_calc arguments.
-    @type num_points:       numpy int array of rank [NE][NS][[NM][NO][ND]
     """
 
     # Flag to tell if values should be replaced if max_etapos in cosh 
function is violated.

Modified: 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py?rev=23916&r1=23915&r2=23916&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py
     (original)
+++ 
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_tsmfk01.py
     Fri Jun 13 11:17:52 2014
@@ -60,7 +60,7 @@
         a = ones([self.num_points])
 
         # Calculate the R2eff values.
-        r2eff_TSMFK01(r20a=self.r20a*a, dw=dw_frq*a, dw_orig=dw_frq, 
k_AB=k_AB, tcp=self.cpmg_frqs, back_calc=self.R2eff, 
num_points=self.num_points)
+        r2eff_TSMFK01(r20a=self.r20a*a, dw=dw_frq*a, dw_orig=dw_frq, 
k_AB=k_AB, tcp=self.cpmg_frqs, back_calc=self.R2eff)
 
         # Check all R2eff values.
         for i in range(self.num_points):