r19270 - /branches/relax_disp/target_functions/relax_disp.py -- March 27, 2013 - 19:08

Author: bugman
Date: Wed Mar 27 19:08:53 2013
New Revision: 19270

URL: http://svn.gna.org/viewcvs/relax?rev=19270&view=rev
Log:
The relaxation dispersion target function class now imports the equations 
from lib.dispersion.equations.


Modified:
    branches/relax_disp/target_functions/relax_disp.py

Modified: branches/relax_disp/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/target_functions/relax_disp.py?rev=19270&r1=19269&r2=19270&view=diff
==============================================================================
--- branches/relax_disp/target_functions/relax_disp.py (original)
+++ branches/relax_disp/target_functions/relax_disp.py Wed Mar 27 19:08:53 
2013
@@ -24,6 +24,7 @@
 """Target functions for relaxation dispersion."""
 
 # relax module imports.
+from lib.dispersion.equations import fast_2site
 from target_functions.chi2 import chi2
 
 
@@ -74,7 +75,7 @@
             params = dot(params, self.scaling_matrix)
 
         # Back calculated the effective transversal relaxation rates.
-        dispersion(params=params, cpmg_frqs=self.cpmg_frqs, 
back_calc=self.back_calc, num_times=self.num_times);
+        fast_2site(params=params, cpmg_frqs=self.cpmg_frqs, 
back_calc=self.back_calc, num_times=self.num_times)
 
         # Calculate and return the chi-squared value.
         return chi2(values, back_calc, sd)