diff --git a/corrscope/spectrum.py b/corrscope/spectrum.py index e9b7bbb..d23205c 100644 --- a/corrscope/spectrum.py +++ b/corrscope/spectrum.py @@ -4,7 +4,7 @@ import numpy as np import corrscope.utils.scipy.signal as signal from corrscope.config import KeywordAttrs -from corrscope.wave import f32 +from corrscope.wave_common import f32 class SpectrumConfig(KeywordAttrs): diff --git a/corrscope/triggers.py b/corrscope/triggers.py index d586bb5..d7c4f66 100644 --- a/corrscope/triggers.py +++ b/corrscope/triggers.py @@ -17,7 +17,7 @@ from corrscope.utils.trigger_util import ( abs_max, ) from corrscope.utils.windows import leftpad, midpad, rightpad, gaussian_or_zero -from corrscope.wave import f32 +from corrscope.wave_common import f32 if TYPE_CHECKING: from corrscope.wave import Wave diff --git a/corrscope/utils/scipy/windows.py b/corrscope/utils/scipy/windows.py index 8b32edc..0eee7f2 100644 --- a/corrscope/utils/scipy/windows.py +++ b/corrscope/utils/scipy/windows.py @@ -37,7 +37,7 @@ from typing import List, Tuple import numpy as np -from corrscope.wave import f32 +from corrscope.wave_common import f32 __all__ = ['boxcar', 'triang', 'parzen', 'bohman', 'blackman', 'nuttall', 'blackmanharris', 'flattop', 'bartlett', 'hanning', 'barthann', diff --git a/corrscope/utils/trigger_util.py b/corrscope/utils/trigger_util.py index 35229de..8c3bdd1 100644 --- a/corrscope/utils/trigger_util.py +++ b/corrscope/utils/trigger_util.py @@ -4,7 +4,7 @@ import numpy as np import corrscope.utils.scipy.signal as signal from corrscope.util import iround -from corrscope.wave import f32 +from corrscope.wave_common import f32 if TYPE_CHECKING: import corrscope.triggers as t diff --git a/corrscope/utils/windows.py b/corrscope/utils/windows.py index 6d5066c..974dcb5 100644 --- a/corrscope/utils/windows.py +++ b/corrscope/utils/windows.py @@ -1,7 +1,7 @@ import numpy as np from corrscope.utils.scipy import windows -from corrscope.wave import f32 +from corrscope.wave_common import f32 def leftpad(data: np.ndarray, n: int) -> np.ndarray: diff --git a/corrscope/wave.py b/corrscope/wave.py index eccdabd..73ed4fe 100644 --- a/corrscope/wave.py +++ b/corrscope/wave.py @@ -6,11 +6,8 @@ import numpy as np import corrscope.utils.scipy.wavfile as wavfile from corrscope.config import CorrError, TypedEnumDump - -f32 = np.single - -# Depends on f32 from corrscope.utils.windows import rightpad +from corrscope.wave_common import f32 @enum.unique diff --git a/corrscope/wave_common.py b/corrscope/wave_common.py new file mode 100644 index 0000000..c07c278 --- /dev/null +++ b/corrscope/wave_common.py @@ -0,0 +1,3 @@ +import numpy as np + +f32 = np.single