Convert calibcant to the new, nestable h5config.

[calibcant.git] / calibcant / vib.py

diff --git a/calibcant/vib.py b/calibcant/vib.py
index e57e1bf73f72152ffe7b5385f9a30fcfcee2ce67..608b9b0db4d8e307c948fdff90bb941d0f0245a2 100644 (file)
--- a/calibcant/vib.py
+++ b/calibcant/vib.py
@@ -89,15 +89,15 @@ def vib(piezo, vibration_config, filename, group='/'):
 
     >>> import os
     >>> import tempfile
-    >>> from h5config.hdf5 import pprint_HDF5
+    >>> from h5config.storage.hdf5 import pprint_HDF5
     >>> from pycomedi.device import Device
     >>> from pycomedi.subdevice import StreamingSubdevice
     >>> from pycomedi.channel import AnalogChannel
     >>> from pycomedi.constant import AREF, SUBDEVICE_TYPE, UNIT
     >>> from pypiezo.afm import AFMPiezo
     >>> from pypiezo.base import InputChannel
-    >>> from pypiezo.config import HDF5_ChannelConfig
-    >>> from .config import HDF5_VibrationConfig
+    >>> from pypiezo.config import ChannelConfig
+    >>> from .config import VibrationConfig
 
     Setup an `AFMPiezo` instance.
 
@@ -113,8 +113,7 @@ def vib(piezo, vibration_config, filename, group='/'):
     >>> channel = s_in.channel(0, factory=AnalogChannel, aref=AREF.diff)
     >>> channel.range = channel.find_range(
     ...     unit=UNIT.volt, min=-10, max=10)
-    >>> channel_config = HDF5_ChannelConfig(
-    ...     filename, group='/vibration/config/deflection/channel')
+    >>> channel_config = ChannelConfig()
 
     >>> c = InputChannel(
     ...     channel_config=channel_config, channel=channel,
@@ -125,8 +124,7 @@ def vib(piezo, vibration_config, filename, group='/'):
 
     Test a vibration:
 
-    >>> vibration_config = HDF5_VibrationConfig(
-    ...     filename=filename, group='/vibration/config/vibration')
+    >>> vibration_config = VibrationConfig()
     >>> vib(piezo, vibration_config, filename, group='/vibration')
     TODO: replace skipped example data with real-world values
     >>> pprint_HDF5(filename)  # doctest: +ELLIPSIS, +REPORT_UDIFF