r3299 - /1.3/maths_fns/mf.py -- May 30, 2007 - 17:31

Author: bugman
Date: Wed May 30 17:31:19 2007
New Revision: 3299

URL: http://svn.gna.org/viewcvs/relax?rev=3299&view=rev
Log:
Fix for bug #9189 (https://gna.org/bugs/index.php?9189).

This bug was reported by Neil Syme (bmbnrs at leeds dot ac dot uk).

Two of the functions accessed when the second set of extended model-free 
formulae - using the
parameters {S2f, tf, S2s, ts} rather than the standard {S2, S2f, tf, ts} - do 
not exist.  This were
changed to the correct functions (hopefully)!


Modified:
    1.3/maths_fns/mf.py

Modified: 1.3/maths_fns/mf.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/mf.py?rev=3299&r1=3298&r2=3299&view=diff
==============================================================================
--- 1.3/maths_fns/mf.py (original)
+++ 1.3/maths_fns/mf.py Wed May 30 17:31:19 2007
@@ -2361,7 +2361,7 @@
                 # Diffusion parameters and model-free parameters {S2f, S2s, 
ts}.
                 if data.s2f_i != None and data.tf_i == None and data.s2s_i 
!= None and data.ts_i != None:
                     # Equation.
-                    data.calc_jw_comps =    calc_diff_S2f_S2s_ts_jw_comps
+                    data.calc_jw_comps =    calc_S2f_S2s_ts_jw_comps
                     data.calc_jw =          calc_S2f_S2s_ts_jw
 
                     # Gradient.
@@ -2483,7 +2483,7 @@
                 # Diffusion parameters and model-free parameters {S2f, tf, 
S2s, ts}.
                 elif data.s2f_i != None and data.tf_i != None and data.s2s_i 
!= None and data.ts_i != None:
                     # Equation.
-                    data.calc_jw_comps =    calc_diff_S2f_tf_S2s_ts_jw_comps
+                    data.calc_jw_comps =    calc_S2f_tf_S2s_ts_jw_comps
                     data.calc_jw =          calc_S2f_tf_S2s_ts_jw
 
                     # Gradient.