r23747 - /branches/disp_spin_speed/target_functions/relax_disp.py -- June 08, 2014 - 23:54

Author: tlinnet
Date: Sun Jun  8 23:54:41 2014
New Revision: 23747

URL: http://svn.gna.org/viewcvs/relax?rev=23747&view=rev
Log:
Moved the data filling of special numpy array errors and values, to 
initialization of Dispersion class.

These values does not change, and can safely be stored outside.

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=23747&r1=23746&r2=23747&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Sun Jun  8 
23:54:41 2014
@@ -436,6 +436,10 @@
                             
self.cpmg_frqs_a[ei][si][mi][oi][:num_disp_points] = 
self.cpmg_frqs[ei][mi][oi]
                             
self.num_disp_points_a[ei][si][mi][oi][:num_disp_points] = 
self.num_disp_points[ei][si][mi][oi]
 
+                            # Extract the errors and values to numpy array.
+                            self.errors_a[ei][si][mi][oi][:num_disp_points] 
= self.errors[0][si][mi][0]
+                            self.values_a[ei][si][mi][oi][:num_disp_points] 
= self.values[0][si][mi][0]
+
                             for di in 
range(self.num_disp_points[ei][si][mi][oi]):
                                 if self.missing[ei][si][mi][oi][di]:
                                     self.has_missing = True
@@ -545,10 +549,6 @@
                 # Store pA and kex per disp point.
                 self.pA_a[0][si][mi][0][:num_disp_points] = pA_arr
                 self.kex_a[0][si][mi][0][:num_disp_points] = kex_arr
-
-                # Extract the errors and values to numpy array.
-                self.errors_a[0][si][mi][0][:num_disp_points] = 
self.errors[0][si][mi][0]
-                self.values_a[0][si][mi][0][:num_disp_points] = 
self.values[0][si][mi][0]
 
         ## Back calculate the R2eff values.
         r2eff_CR72(r20a=self.R20A_a, r20b=self.R20B_a, pA=self.pA_a, 
dw=self.dw_frq_a, kex=self.kex_a, cpmg_frqs=self.cpmg_frqs_a, 
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)