r23892 - /branches/disp_spin_speed/target_functions/relax_disp.py -- June 12, 2014 - 20:08

Author: tlinnet
Date: Thu Jun 12 20:08:08 2014
New Revision: 23892

URL: http://svn.gna.org/viewcvs/relax?rev=23892&view=rev
Log:
Fix for forgetting to multiply frqs to power 2.

This was found by inspecting all print out before and after implementation.

New implementation of DPL94 now passes all system and unit tests.

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=23892&r1=23891&r2=23892&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:08:08 2014
@@ -1056,7 +1056,7 @@
         kex = params[self.end_index[1]]
 
         # Convert phi_ex from ppm^2 to (rad/s)^2. Use the out argument, to 
pass directly to structure.
-        multiply( multiply.outer( phi_ex.reshape(self.NE, self.NS), 
self.nm_no_nd_struct ), self.frqs_struct, out=self.phi_ex_struct )
+        multiply( multiply.outer( phi_ex.reshape(self.NE, self.NS), 
self.nm_no_nd_struct ), self.frqs_struct*self.frqs_struct, 
out=self.phi_ex_struct )
 
         # Reshape R20 to per experiment, spin and frequency.
         self.r20_struct[:] = multiply.outer( R20.reshape(self.NE, self.NS, 
self.NM), self.no_nd_struct )