Convert calibcant to the new, nestable h5config.

[calibcant.git] / calibcant / T.py

diff --git a/calibcant/T.py b/calibcant/T.py
index 1bbe88bf1bf1da2106c0b0d3f45f178f10239c30..bf3c29dd5f799f1196f29e9b66aec19443770f53 100644 (file)
--- a/calibcant/T.py
+++ b/calibcant/T.py
@@ -3,7 +3,7 @@
 # We just wrap that to provide a consistent interface.
 
 from . import LOG as _LOG
-from . import base_config as _base_config
+from . import package_config as _package_config
 from .T_analyze import T_analyze as _T_analyze
 from .T_analyze import T_save as _T_save
 
@@ -12,7 +12,7 @@ def T_acquire(get_T=None):
     """Measure the current temperature of the sample, 
 
     If `get_T` is `None`, fake it by returning
-    `base_config['temperature']`.
+    `package_config['temperature']`.
     """
     if get_T:
         _LOG.info('measure temperature')
@@ -20,8 +20,8 @@ def T_acquire(get_T=None):
     else:
         T = None
     if T is None:
-        _LOG.info('fake temperature %g' % _base_config['temperature'])
-        T = _base_config['temperature']
+        _LOG.info('fake temperature %g' % _package_config['temperature'])
+        T = _package_config['temperature']
     return T
 
 def T(get_T, temperature_config, filename, group='/'):
@@ -29,25 +29,24 @@ def T(get_T, temperature_config, filename, group='/'):
 
     >>> import os
     >>> import tempfile
-    >>> from pypiezo.config import pprint_HDF5
-    >>> from .config import HDF5_TemperatureConfig
+    >>> from h5config.storage.hdf5 import HDF5_Storage, pprint_HDF5
+    >>> from .config import TemperatureConfig
 
     >>> fd,filename = tempfile.mkstemp(suffix='.h5', prefix='calibcant-')
     >>> os.close(fd)
 
-    >>> temperature_config = HDF5_TemperatureConfig(
-    ...     filename=filename, group='/T/config/')
+    >>> temperature_config = TemperatureConfig(storage=HDF5_Storage(
+    ...         filename=filename, group='/T/config/'))
     >>> def get_T():
     ...     return 19.2
-
     >>> t = T(get_T=get_T, temperature_config=temperature_config,
     ...     filename=filename, group='/T/')
     >>> pprint_HDF5(filename)  # doctest: +ELLIPSIS, +REPORT_UDIFF
     /
       /T
         /T/config
-          <HDF5 dataset "default": shape (), type "|S2">
-            no
+          <HDF5 dataset "default": shape (), type "|b1">
+            False
           <HDF5 dataset "units": shape (), type "|S7">
             Celsius
         <HDF5 dataset "processed": shape (), type "<f8">
@@ -60,8 +59,8 @@ def T(get_T, temperature_config, filename, group='/'):
     /
       /T
         /T/config
-          <HDF5 dataset "default": shape (), type "|S3">
-            yes
+          <HDF5 dataset "default": shape (), type "|b1">
+            True
           <HDF5 dataset "units": shape (), type "|S7">
             Celsius
         <HDF5 dataset "processed": shape (), type "<f8">
@@ -74,6 +73,7 @@ def T(get_T, temperature_config, filename, group='/'):
     >>> os.remove(filename)
     """
     T_raw = T_acquire(get_T)
+    _LOG.debug('got T: %s' % T_raw)
     T_ret = _T_analyze(T_raw, temperature_config)
     temperature_config['default'] = not get_T
     _T_save(filename, group=group, raw_T=T_raw,