r15192 - /branches/spec_api/specific_fns/api_base.py -- January 19, 2012 - 11:36

Author: bugman
Date: Thu Jan 19 11:36:30 2012
New Revision: 15192

URL: http://svn.gna.org/viewcvs/relax?rev=15192&view=rev
Log:
Removed spin args from return_conversion_factor() and added optimisation 
parameters.

The global and spin specific optimisation parameters are now set up for all 
specific analyses.


Modified:
    branches/spec_api/specific_fns/api_base.py

Modified: branches/spec_api/specific_fns/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spec_api/specific_fns/api_base.py?rev=15192&r1=15191&r2=15192&view=diff
==============================================================================
--- branches/spec_api/specific_fns/api_base.py (original)
+++ branches/spec_api/specific_fns/api_base.py Thu Jan 19 11:36:30 2012
@@ -42,6 +42,20 @@
     # Add some spin specific objects.
     SPIN_PARAMS.add('select', desc='The spin selection flag')
     SPIN_PARAMS.add('fixed', desc='The fixed flag')
+    SPIN_PARAMS.add('chi2', desc='Chi-squared value')
+    SPIN_PARAMS.add('iter', desc='Optimisation iterations')
+    SPIN_PARAMS.add('f_count', desc='Number of function calls')
+    SPIN_PARAMS.add('g_count', desc='Number of gradient calls')
+    SPIN_PARAMS.add('h_count', desc='Number of Hessian calls')
+    SPIN_PARAMS.add('warning', desc='Optimisation warning')
+
+    # Add some global objects.
+    GLOBAL_PARAMS.add('chi2', desc='Chi-squared value')
+    GLOBAL_PARAMS.add('iter', desc='Optimisation iterations')
+    GLOBAL_PARAMS.add('f_count', desc='Number of function calls')
+    GLOBAL_PARAMS.add('g_count', desc='Number of gradient calls')
+    GLOBAL_PARAMS.add('h_count', desc='Number of Hessian calls')
+    GLOBAL_PARAMS.add('warning', desc='Optimisation warning')
 
 
     def back_calc_ri(self, spin_index=None, ri_id=None, ri_type=None, 
frq=None):
@@ -493,13 +507,11 @@
         raise RelaxImplementError
 
 
-    def return_conversion_factor(self, param, spin=None, spin_id=None):
+    def return_conversion_factor(self, param):
         """Return the conversion factor.
 
         @param param:       The parameter name.
         @type param:        str
-        @param spin:        Spin container.
-        @type spin:         SpinContainer instance
         @return:            A conversion factor of 1.0.
         @rtype:             float
         """