r23868 - /branches/disp_spin_speed/target_functions/relax_disp.py -- June 12, 2014 - 12:23

Author: tlinnet
Date: Thu Jun 12 12:23:18 2014
New Revision: 23868

URL: http://svn.gna.org/viewcvs/relax?rev=23868&view=rev
Log:
Changed target function for model B14.

To B14 now also send the input of the original parameters dw.
dw is tested for zero, to return flat lines.
It is faster to search in the smaller numpy array, than the 5 dimensional dw 
array.

This is for speed-up.

These small tricks are expected to give 5-10 pct. speeed-up.

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

Modified:
    branches/disp_spin_speed/target_functions/relax_disp.py

Modified: branches/disp_spin_speed/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/target_functions/relax_disp.py?rev=23868&r1=23867&r2=23868&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Thu Jun 12 
12:23:18 2014
@@ -523,7 +523,7 @@
         self.r20b_struct[:] = multiply.outer( R20B.reshape(self.NE, self.NS, 
self.NM), self.no_nd_struct )
 
         # Back calculate the R2eff values.
-        r2eff_B14(r20a=self.r20a_struct, r20b=self.r20b_struct, pA=pA, 
pB=pB, dw=self.dw_struct, kex=kex, k_AB=k_AB, k_BA=k_BA, ncyc=self.power_a, 
inv_tcpmg=self.inv_relax_times_a, tcp=self.tau_cpmg_a, 
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)
+        r2eff_B14(r20a=self.r20a_struct, r20b=self.r20b_struct, pA=pA, 
pB=pB, dw=self.dw_struct, dw_orig=dw, kex=kex, k_AB=k_AB, k_BA=k_BA, 
ncyc=self.power_a, inv_tcpmg=self.inv_relax_times_a, tcp=self.tau_cpmg_a, 
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)
 
         # Clean the data for all values, which is left over at the end of 
arrays.
         self.back_calc_a = self.back_calc_a*self.disp_struct