r24563 - in /branches/zooming_grid_search: ./ specific_analyses/parameter_object.py -- July 18, 2014 - 10:59

Author: bugman
Date: Fri Jul 18 10:59:46 2014
New Revision: 24563

URL: http://svn.gna.org/viewcvs/relax?rev=24563&view=rev
Log:
Merged revisions 24562 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r24562 | bugman | 2014-07-18 10:58:56 +0200 (Fri, 18 Jul 2014) | 7 lines
  
  Bug fix for the parameter units descriptions.
  
  This only affects a few rare parameters.  The specific analysis API 
parameter object units() method
  was incorrectly checking if the units value is a function - it was checking 
the parameter conversion
  factor instead.
........

Modified:
    branches/zooming_grid_search/   (props changed)
    branches/zooming_grid_search/specific_analyses/parameter_object.py

Propchange: branches/zooming_grid_search/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 18 10:59:46 2014
@@ -1 +1 @@
-/trunk:1-24550
+/trunk:1-24562

Modified: branches/zooming_grid_search/specific_analyses/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/specific_analyses/parameter_object.py?rev=24563&r1=24562&r2=24563&view=diff
==============================================================================
--- branches/zooming_grid_search/specific_analyses/parameter_object.py  
(original)
+++ branches/zooming_grid_search/specific_analyses/parameter_object.py  Fri 
Jul 18 10:59:46 2014
@@ -703,7 +703,7 @@
         self.check_param(name)
 
         # Function.
-        if isinstance(self._conv_factor[name], FunctionType) or 
isinstance(self._conv_factor[name], MethodType):
+        if isinstance(self._units[name], FunctionType) or 
isinstance(self._units[name], MethodType):
             return self._units[name]()
 
         # Return the value.