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

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

URL: http://svn.gna.org/viewcvs/relax?rev=23829&view=rev
Log:
Renamed dw temporary structure to generic 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=23829&r1=23828&r2=23829&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:18 2014
@@ -439,7 +439,7 @@
             # Create special numpy structures.
             # Structure of dw. The full and the outer dimensions structures.
             self.dw_struct = deepcopy(zeros_a)
-            self.dw_outer = ones([self.NM, self.NO, self.ND], float64)
+            self.nm_no_nd_struct = ones([self.NM, self.NO, self.ND], float64)
 
             # Loop over the experiment types.
             for ei in range(self.NE):
@@ -555,7 +555,7 @@
         """
 
         # Convert dw from ppm to rad/s. Use the out argument, to pass 
directly to structure.
-        multiply( multiply.outer( asarray(dw).reshape(self.NE, self.NS), 
self.dw_outer ), self.frqs_struct, out=self.dw_struct )
+        multiply( multiply.outer( asarray(dw).reshape(self.NE, self.NS), 
self.nm_no_nd_struct ), self.frqs_struct, out=self.dw_struct )
 
         # Reshape R20A and R20B to per experiment, spin and frequency.
         R20A_axis = R20A.reshape(self.NE, self.NS, self.NM)