r25468 - /trunk/specific_analyses/relax_disp/estimate_r2eff.py -- August 30, 2014 - 01:03

Author: tlinnet
Date: Sat Aug 30 01:03:36 2014
New Revision: 25468

URL: http://svn.gna.org/viewcvs/relax?rev=25468&view=rev
Log:
Moved the argument 'chi2_jacobian' as the last argument in estimate_r2eff_err.

This argument is highly likely not to be used, but is kept for future testing 
purposes.

task #7822(https://gna.org/task/index.php?7822): Implement user function to 
estimate R2eff and associated errors for exponential curve fitting.

Modified:
    trunk/specific_analyses/relax_disp/estimate_r2eff.py

Modified: trunk/specific_analyses/relax_disp/estimate_r2eff.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/estimate_r2eff.py?rev=25468&r1=25467&r2=25468&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/estimate_r2eff.py        (original)
+++ trunk/specific_analyses/relax_disp/estimate_r2eff.py        Sat Aug 30 
01:03:36 2014
@@ -57,17 +57,17 @@
     from scipy.optimize import leastsq
 
 
-def estimate_r2eff_err(chi2_jacobian=False, spin_id=None, epsrel=0.0, 
verbosity=1):
+def estimate_r2eff_err(spin_id=None, epsrel=0.0, verbosity=1, 
chi2_jacobian=False):
     """This will estimate the R2eff and i0 errors from the covariance matrix 
Qxx.  Qxx is calculated from the Jacobian matrix and the optimised parameters.
 
-    @keyword chi2_jacobian: If the Jacobian derived from the chi2 function, 
should be used instead of the Jacobian from the exponential function.
-    @type chi2_jacobian:    bool
     @keyword spin_id:       The spin identification string.
     @type spin_id:          str
     @param epsrel:          Any columns of R which satisfy |R_{kk}| <= 
epsrel |R_{11}| are considered linearly-dependent and are excluded from the 
covariance matrix, where the corresponding rows and columns of the covariance 
matrix are set to zero.
     @type epsrel:           float
     @keyword verbosity:     The amount of information to print.  The higher 
the value, the greater the verbosity.
     @type verbosity:        int
+    @keyword chi2_jacobian: If the Jacobian derived from the chi2 function, 
should be used instead of the Jacobian from the exponential function.
+    @type chi2_jacobian:    bool
     """
 
     # Check that the C modules have been compiled.