r9210 - /1.3/generic_fns/minimise.py -- July 13, 2009 - 18:29

Author: bugman
Date: Mon Jul 13 18:29:31 2009
New Revision: 9210

URL: http://svn.gna.org/viewcvs/relax?rev=9210&view=rev
Log:
Bug fixes for return_conversion_factor() and return_units() functions.

The spin and spin_id args are now accepted.


Modified:
    1.3/generic_fns/minimise.py

Modified: 1.3/generic_fns/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/minimise.py?rev=9210&r1=9209&r2=9210&view=diff
==============================================================================
--- 1.3/generic_fns/minimise.py (original)
+++ 1.3/generic_fns/minimise.py Mon Jul 13 18:29:31 2009
@@ -248,11 +248,13 @@
         minimise(min_algor=min_algor, min_options=min_options, 
func_tol=func_tol, grad_tol=grad_tol, max_iterations=max_iterations, 
constraints=constraints, scaling=scaling, verbosity=verbosity)
 
 
-def return_conversion_factor(stat_type):
+def return_conversion_factor(stat_type, spin):
     """Dummy function for returning 1.0.
 
     @param stat_type:   The name of the statistic.  This is unused!
     @type stat_type:    str
+    @param spin:        Spin container (not used).
+    @type spin:         SpinContainer instance
     @return:            A conversion factor of 1.0.
     @rtype:             float
     """
@@ -341,11 +343,13 @@
     return grace_string
 
 
-def return_units(stat_type):
+def return_units(stat_type, spin_id=None):
     """Dummy function which returns None as the stats have no units.
 
     @param stat_type:   The name of the statistic.  This is unused!
     @type stat_type:    str
+    @keyword spin_id:   Not used.
+    @type spin_id:      None
     @return:            Nothing.
     @rtype:             None
     """