r23826 - /branches/disp_spin_speed/target_functions/relax_disp.py -- June 11, 2014 - 13:12

Author: tlinnet
Date: Wed Jun 11 13:12:12 2014
New Revision: 23826

URL: http://svn.gna.org/viewcvs/relax?rev=23826&view=rev
Log:
Simplified calculation.

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=23826&r1=23825&r2=23826&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Wed Jun 11 
13:12:12 2014
@@ -576,9 +576,7 @@
             # Expand dw to number of axis for frequency, offset and 
dispersion points.
             # Tile dw according to dimensions.
             # Convert dw from ppm to rad/s.
-            # First clear the data from last call.
-            self.dw_struct[:] = 1.0
-            self.dw_struct[:] = multiply(self.dw_struct, 
tile(asarray(dw).reshape(self.NE, self.NS)[:,:,None,None,None], (1, 1, 
self.NM, self.NO, self.ND)), ) * self.disp_struct * self.frqs_a
+            self.dw_struct[:] = tile(asarray(dw).reshape(self.NE, 
self.NS)[:,:,None,None,None], (1, 1, self.NM, self.NO, self.ND)) * 
self.disp_struct * self.frqs_a
 
         # Reshape R20A and R20B to per experiment, spin and frequency.
         R20A_axis = R20A.reshape(self.NE, self.NS, self.NM)