Assorted typo fixes turned up by test suite.
authorW. Trevor King <wking@drexel.edu>
Fri, 29 Jul 2011 13:33:39 +0000 (09:33 -0400)
committerW. Trevor King <wking@drexel.edu>
Fri, 29 Jul 2011 13:33:39 +0000 (09:33 -0400)
pypiezo/afm.py
pypiezo/base.py

index 8430ba65c2e00c7e918c0dac5f1e74196cafec79..8f211dfb382c9d89f934d9f34b136b47b236cf99 100644 (file)
@@ -84,7 +84,7 @@ class AFMPiezo (_base.Piezo):
     >>> c = _base.InputChannel(config=input_config, channel=input_channel)
     >>> c.setup_config()
 
-    >>> p = AFMPiezo(axes=[a], input_channels=[c], name='Molly')
+    >>> p = AFMPiezo(axes=[a], channels=[c], name='Molly')
 
     >>> deflection = p.read_deflection()
     >>> deflection  # doctest: +SKIP
index 4e58cdb449fe627c77e51d49226b50393eec9ed1..eb8d221ce9c684df019fff356a6ab91a3d443c47 100644 (file)
@@ -284,8 +284,8 @@ class PiezoAxis (object):
         if self.config['minimum'] is None:
             self.config['minimum'] = convert_bits_to_volts(
                 self.config['channel'], 0)
-        if self.axis_config['maximum'] is None:
-            self.axis_config['maximum'] = convert_bits_to_volts(
+        if self.config['maximum'] is None:
+            self.config['maximum'] = convert_bits_to_volts(
                 self.config['channel'], self.axis_channel.get_maxdata())