Change ctool.pars() to ctool.pardict() and cscript.pars() to cscript.pardict()

Jürgen Knödlseder
1 parent 03ebfe59
Showing 2 changed files with 8 additions and 10 deletions
pyext/ctool.i
test/test_ctbin.py
@@ -211,14 +211,12 @@ def _init_cscript(self, argv):
     self._log.date(True)
 cscript._init_cscript = _init_cscript
  
-# Return or assigns user parameters in form of a dictionary
-#
 # This function either returns or assigns user parameters in form of a
 # dictionary. The assignment function takes a dictionary as argument and
 # the function then loops over all keys in that dictionary and assigns
 # the value to the parameter. For example
 #
-# >>> tool.pars({'ra': 83.63, 'dec': 22.01})
+# >>> tool.pardict({'ra': 83.63, 'dec': 22.01})
 #
 # is equivalent to
 #
@@ -230,10 +228,10 @@ cscript._init_cscript = _init_cscript
 # keys and the current values as values. No parameter querying is performed.
 # For example
 #
-# >>> d = tool.pars()
+# >>> d = tool.pardict()
 #
 # puts all parameters in the dictionary d.
-def _parameters(self, *args):
+def _pardict(self, *args):
     if len(args) == 0:
         d = {}
         for par in self._pars():
@@ -252,7 +250,7 @@ def _parameters(self, *args):
         for key in args[0]:
             self[key] = args[0][key]
     else:
-        raise TypeError('pars() takes 0 or 1 arguments (%d given)' % len(args))
-ctool.pars = _parameters
-cscript.pars = _parameters
+        raise TypeError('pardict() takes 0 or 1 arguments (%d given)' % len(args))
+ctool.pardict = _pardict
+cscript.pardict = _pardict
 %}
@@ -237,13 +237,13 @@ class Test(test):
  
         # And finally go for a fully Pythonic version with all parameters
         # being specified in a dictionary
-        dict = {'inobs': self._events, 'ebinalg': 'LOG', 'emin': 0.1,
+        pars = {'inobs': self._events, 'ebinalg': 'LOG', 'emin': 0.1,
                 'emax': 100.0, 'enumbins': 10, 'nxpix': 40, 'nypix': 40,
                 'binsz': 0.1, 'coordsys': 'CEL', 'proj': 'CAR',
                 'xref': 83.63, 'yref': 22.01, 'outcube': 'ctbin_py4.fits',
                 'logfile': 'ctbin_py4.log', 'chatter': 2}
         bin = ctools.ctbin()
-        bin.pars(dict)
+        bin.pardict(pars)
         bin.logFileOpen()
         bin.execute()