Author: tlinnet Date: Tue Jun 10 01:01:55 2014 New Revision: 23763 URL: http://svn.gna.org/viewcvs/relax?rev=23763&view=rev Log: Reordered arrays for beauty of code. 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=23763&r1=23762&r2=23763&view=diff ============================================================================== --- branches/disp_spin_speed/target_functions/relax_disp.py (original) +++ branches/disp_spin_speed/target_functions/relax_disp.py Tue Jun 10 01:01:55 2014 @@ -417,15 +417,17 @@ # All numpy arrays have to have same shape to allow to multiply together. # The dimensions should be [ei][si][mi][oi][di]. [Experiment][spins][spec. frq][offset][disp points]. # The number of disp point can change per spectrometer, so we make the maximum size. + self.values_a = deepcopy(self.ones_a) + self.errors_a = deepcopy(self.ones_a) + self.back_calc_a = deepcopy(self.ones_a) + self.cpmg_frqs_a = deepcopy(self.ones_a) self.num_disp_points_a = deepcopy(self.ones_a) - self.back_calc_a = deepcopy(self.ones_a) - self.errors_a = deepcopy(self.ones_a) - self.values_a = deepcopy(self.ones_a) - self.has_missing = False + self.frqs_a = deepcopy(self.zeros_a) self.spins_a = deepcopy(self.zeros_a) self.not_spins_a = deepcopy(self.ones_a) + self.has_missing = False # Loop over the experiment types. for ei in range(self.num_exp):