convert to H5config and bump to v0.7.

[calibcant.git] / calibcant / vib_analyze.py

diff --git a/calibcant/vib_analyze.py b/calibcant/vib_analyze.py
index 59c83170daddabf5a30ec0e342b0a16fa944047c..38997a6c414e7809c5d4596750c86e8c3609beeb 100644 (file)
--- a/calibcant/vib_analyze.py
+++ b/calibcant/vib_analyze.py
@@ -32,7 +32,7 @@ The relevent physical quantities are :
 >>> import tempfile
 >>> import numpy
 >>> from .config import HDF5_VibrationConfig
->>> from pypiezo.config import pprint_HDF5, HDF5_ChannelConfig
+>>> from h5config.hdf5 import pprint_HDF5, HDF5_ChannelConfig
 >>> from pypiezo.base import convert_volts_to_bits
 
 >>> fd,filename = tempfile.mkstemp(suffix='.h5', prefix='calibcant-')
@@ -228,13 +228,13 @@ except (ImportError, RuntimeError), e:
     _matplotlib = None
     _matplotlib_import_error = e
 
+from h5config.hdf5 import h5_create_group as _h5_create_group
 import FFT_tools as _FFT_tools
 from pypiezo.base import convert_bits_to_volts as _convert_bits_to_volts
 from pypiezo.config import HDF5_ChannelConfig as _HDF5_ChannelConfig
-from pypiezo.config 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 .config import Variance as _Variance
 from .config import BreitWigner as _BreitWigner
 from .config import OffsetBreitWigner as _OffsetBreitWigner
@@ -271,7 +271,7 @@ def vib_analyze(deflection, vibration_config, deflection_channel_config,
       deflection        Vphoto deflection input in bits.
       vibration_config  `.config._VibrationConfig` instance
       deflection_channel_config
-                        deflection `pypiezo.config._ChannelConfig` instance
+                        deflection `pypiezo.config.ChannelConfig` instance
       plot              boolean overriding matplotlib config setting.
 
     The conversion to frequency space generates an average power
@@ -305,7 +305,7 @@ def vib_analyze(deflection, vibration_config, deflection_channel_config,
     _LOG.debug('fit PSD(f) = C / ((A**2-f**2)**2 + (f*B)**2) with '
                'A = %g, B = %g, C = %g, D = %g' % (A, B, C, D))
 
-    if plot or _base_config['matplotlib']:
+    if plot or _package_config['matplotlib']:
         vib_plot(deflection, freq_axis, power, A, B, C, D,
                  vibration_config=vibration_config)
 
@@ -314,7 +314,7 @@ def vib_analyze(deflection, vibration_config, deflection_channel_config,
 
     _LOG.debug('fitted deflection variance: %g V**2' % fitted_variance)
 
-    if _base_config['matplotlib']:
+    if _package_config['matplotlib']:
         vib_plot(deflection, freq_axis, power, A, B, C, D,
                  vibration_config=vibration_config)