[prev in list] [next in list] [prev in thread] [next in thread] 

List:       relax-commits
Subject:    r3301 - in /1.2: ./ maths_fns/mf.py
From:       edward () domain ! hid
Date:       2007-05-30 16:03:08
Message-ID: E1HtQdg-0006Ga-CH () subversion ! gna ! org
[Download RAW message or body]

Author: bugman
Date: Wed May 30 18:03:07 2007
New Revision: 3301

URL: http://svn.gna.org/viewcvs/relax?rev=3301&view=rev
Log:
Merged revisions 3299 via svnmerge from 
svn+ssh://bugman@domain.hid

........
  r3299 | bugman | 2007-05-30 17:31:19 +0200 (Wed, 30 May 2007) | 9 lines
  
  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.2/   (props changed)
    1.2/maths_fns/mf.py

Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 30 18:03:07 2007
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299

Modified: 1.2/maths_fns/mf.py
URL: http://svn.gna.org/viewcvs/relax/1.2/maths_fns/mf.py?rev=3301&r1=3300&r2=3301&view=diff
 ==============================================================================
--- 1.2/maths_fns/mf.py (original)
+++ 1.2/maths_fns/mf.py Wed May 30 18:03:07 2007
@@ -2359,7 +2359,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.
@@ -2481,7 +2481,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.


[prev in list] [next in list] [prev in thread] [next in thread]