Author: tlinnet Date: Thu Jun 12 20:35:08 2014 New Revision: 23896 URL: http://svn.gna.org/viewcvs/relax?rev=23896&view=rev Log: For inv_relax_times, expanded one axis, and tiled up to NR spins, before reshaping and blowing up to full structure. 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=23896&r1=23895&r2=23896&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:08 2014 @@ -457,7 +457,7 @@ if model not in [MODEL_DPL94]: # Expand relax times. - self.inv_relax_times_a = 1.0 / multiply.outer( self.relax_times.reshape(self.NE, self.NS, self.NM), self.no_nd_struct ) + self.inv_relax_times_a = 1.0 / multiply.outer( tile(self.relax_times[:,None],(1, 1, self.NS)).reshape(self.NE, self.NS, self.NM), self.no_nd_struct ) if model in [MODEL_DPL94]: self.r1_a = multiply.outer( self.r1.reshape(self.NE, self.NS, self.NM), self.no_nd_struct )