convert to H5config and bump to v0.7.

[calibcant.git] / calibcant / analyze.py

diff --git a/calibcant/analyze.py b/calibcant/analyze.py
index 430ffe9c4e1165d867cebf2193e773bf9ac93002..d32e7faf72ee8fbb0cdc8a4067a0a097b8b52385 100644 (file)
--- a/calibcant/analyze.py
+++ b/calibcant/analyze.py
@@ -44,7 +44,7 @@ Which are related by the parameters:
 >>> import os
 >>> import tempfile
 >>> import numpy
->>> from pypiezo.config import pprint_HDF5
+>>> from h5config.hdf5 import pprint_HDF5
 >>> from .config import HDF5_CalibrationConfig
 
 >>> fd,filename = tempfile.mkstemp(suffix='.h5', prefix='calibcant-')
@@ -140,10 +140,10 @@ except (ImportError, RuntimeError), e:
     _matplotlib = None
     _matplotlib_import_error = e
 
-from pypiezo.config import h5_create_group as _h5_create_group
+from h5config.hdf5 import h5_create_group as _h5_create_group
 
 from . import LOG as _LOG
-from . import base_config as _base_config
+from . import package_config as _package_config
 from .bump_analyze import bump_analyze as _bump_analyze
 from .bump_analyze import bump_load as _bump_load
 from .bump_analyze import bump_save as _bump_save
@@ -215,7 +215,7 @@ def calib_analyze(bumps, temperatures, vibrations):
     _LOG.info('vibration variance (V^2) : %g +/- %g (%g)'
               % (v2_m, v2_s, v2_s/v2_m))
 
-    if _base_config['matplotlib']:
+    if _package_config['matplotlib']:
         calib_plot(bumps, temperatures, vibrations)
 
     return (k, k_s)