r23842 - /branches/disp_spin_speed/lib/dispersion/cr72.py -- June 11, 2014 - 16:19

Author: tlinnet
Date: Wed Jun 11 16:19:10 2014
New Revision: 23842

URL: http://svn.gna.org/viewcvs/relax?rev=23842&view=rev
Log:
Removed an the creation of a unnessary structure bu using numpy multiply.

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

Modified:
    branches/disp_spin_speed/lib/dispersion/cr72.py

Modified: branches/disp_spin_speed/lib/dispersion/cr72.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/cr72.py?rev=23842&r1=23841&r2=23842&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/cr72.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/cr72.py     Wed Jun 11 16:19:10 
2014
@@ -92,7 +92,7 @@
 """
 
 # Python module imports.
-from numpy import arccosh, array, cos, cosh, isfinite, fabs, min, max, sqrt, 
subtract, sum
+from numpy import arccosh, array, cos, cosh, isfinite, fabs, min, max, 
multiply, sqrt, subtract, sum
 from numpy.ma import fix_invalid, masked_greater_equal, masked_less, 
masked_where
 
 # Repetitive calculations (to speed up calculations).
@@ -182,7 +182,8 @@
         return
 
     # Calculate R2eff. This uses the temporary buffer and fill directly to 
back_calc.
-    subtract(r20_kex, cpmg_frqs * arccosh( fact ), out=back_calc)
+    multiply(cpmg_frqs,  arccosh(fact), out=back_calc)
+    subtract(r20_kex, back_calc, out=back_calc)
 
     # Replace data in array.
     # If dw is zero.