Author: tlinnet Date: Thu Jun 12 20:35:04 2014 New Revision: 23894 URL: http://svn.gna.org/viewcvs/relax?rev=23894&view=rev Log: Moved the packing of errors and values out of for loop in the __init__ class of target function. 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=23894&r1=23893&r2=23894&view=diff ============================================================================== --- branches/disp_spin_speed/target_functions/relax_disp.py (original) +++ branches/disp_spin_speed/target_functions/relax_disp.py Thu Jun 12 20:35:04 2014 @@ -480,9 +480,9 @@ # Make a spin 1/0 file. self.disp_struct[ei][si][mi][oi][:num_disp_points] = ones(num_disp_points) - # Extract the errors and values to numpy array. - self.errors_a[ei][si][mi][oi][:num_disp_points] = self.errors[ei][si][mi][oi] - self.values_a[ei][si][mi][oi][:num_disp_points] = self.values[ei][si][mi][oi] + # Extract the errors and values to numpy array. + self.errors_a[ei][si][mi][oi][:num_disp_points] = self.errors[ei][si][mi][oi] + self.values_a[ei][si][mi][oi][:num_disp_points] = self.values[ei][si][mi][oi] # Loop over dispersion points. @@ -495,8 +495,6 @@ self.tau_cpmg_a[ei][si][mi][oi][di] = 0.25 / self.cpmg_frqs[ei][mi][0][di] # For R1rho data. if model in [MODEL_DPL94]: - self.errors_a[ei][si][mi][oi][di] = self.errors[ei][si][mi][oi][di] - self.values_a[ei][si][mi][oi][di] = self.values[ei][si][mi][oi][di] self.disp_struct[ei][si][mi][oi][di] = 1.0 # Extract the frequencies to numpy array.