Convert calibcant to the new, nestable h5config.

[calibcant.git] / calibcant / bump.py

diff --git a/calibcant/bump.py b/calibcant/bump.py
index 8cf78ad34dd321b08a28612c7ed474aad1f31b2e..1e2a5b0f97009d3e001b72d2ccacffff1aa27961 100644 (file)
--- a/calibcant/bump.py
+++ b/calibcant/bump.py
@@ -123,17 +123,17 @@ def bump(afm, bump_config, filename, group='/'):
 
     >>> import os
     >>> import tempfile
+    >>> from h5config.storage.hdf5 import HDF5_Storage, pprint_HDF5
     >>> from pycomedi.device import Device
     >>> from pycomedi.subdevice import StreamingSubdevice
     >>> from pycomedi.channel import AnalogChannel, DigitalChannel
     >>> from pycomedi.constant import AREF, IO_DIRECTION, SUBDEVICE_TYPE, UNIT
     >>> from pypiezo.afm import AFMPiezo
     >>> from pypiezo.base import PiezoAxis, InputChannel
-    >>> from pypiezo.config import (HDF5_ChannelConfig, HDF5_AxisConfig,
-    ...     pprint_HDF5)
+    >>> from pypiezo.config import ChannelConfig, AxisConfig
     >>> from stepper import Stepper
     >>> from pyafm import AFM
-    >>> from .config import HDF5_BumpConfig
+    >>> from .config import BumpConfig
 
     >>> fd,filename = tempfile.mkstemp(suffix='.h5', prefix='calibcant-')
     >>> os.close(fd)
@@ -161,13 +161,14 @@ def bump(afm, bump_config, filename, group='/'):
     first few surface approaching steps, which could lead to an
     `EdgeKink` error instead of a `FlatFit` error.
 
-    >>> axis_config = HDF5_AxisConfig(filename, '/bump/config/z/axis')
+    >>> axis_config = AxisConfig(storage=HDF5_Storage(
+    ...         filename=filename, group='/bump/config/z/axis'))
     >>> axis_config.update(
     ...     {'gain':20, 'sensitivity':8e-9, 'minimum':-9})
-    >>> axis_channel_config = HDF5_ChannelConfig(
-    ...     filename, '/bump/config/z/channel')
-    >>> input_channel_config = HDF5_ChannelConfig(
-    ...     filename, '/bump/config/deflection/channel')
+    >>> axis_channel_config = ChannelConfig(storage=HDF5_Storage(
+    ...         filename=filename, group='/bump/config/z/channel'))
+    >>> input_channel_config = ChannelConfig(storage=HDF5_Storage(
+    ...         filename=filename, group='/bump/config/deflection/channel'))
 
     >>> a = PiezoAxis(axis_config=axis_config,
     ...     axis_channel_config=axis_channel_config,
@@ -200,8 +201,8 @@ def bump(afm, bump_config, filename, group='/'):
 
     Test a bump:
 
-    >>> bump_config = HDF5_BumpConfig(
-    ...     filename=filename, group='/bump/config/bump')
+    >>> bump_config = BumpConfig(storage=HDF5_Storage(
+    ...         filename=filename, group='/bump/config/bump'))
     >>> bump(afm, bump_config, filename, group='/bump')
     TODO: replace skipped example data with real-world values
     >>> pprint_HDF5(filename)  # doctest: +ELLIPSIS, +REPORT_UDIFF