pywavelet 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

pywavelet/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.4'
-__version_tuple__ = version_tuple = (0, 2, 4)
+__version__ = version = '0.2.5'
+__version_tuple__ = version_tuple = (0, 2, 5)

pywavelet/transforms/jax/forward/from_time.py

@@ -1,12 +1,14 @@
+from functools import partial
+
 import jax
 import jax.numpy as jnp
 from jax import jit
 from jax.numpy.fft import rfft
-from functools import partial
 
-@partial(jit, static_argnames=('Nf', 'Nt', 'mult'))
+
+@partial(jit, static_argnames=("Nf", "Nt", "mult"))
 def transform_wavelet_time_helper(
-    data: jnp.ndarray, phi: jnp.ndarray, Nf: int, Nt: int,  mult: int
+    data: jnp.ndarray, phi: jnp.ndarray, Nf: int, Nt: int, mult: int
 ) -> jnp.ndarray:
     """Helper function to do the wavelet transform in the time domain using JAX"""
     # Define constants
@@ -35,17 +37,23 @@ def transform_wavelet_time_helper(
     even_indices = jnp.nonzero(even_mask, size=even_mask.shape[0])[0]
 
     # Update wave for m=0 using even time bins
-    wave = wave.at[even_indices, 0].set(jnp.real(wdata_trans[even_indices, 0]) / jnp.sqrt(2))
-    wave = wave.at[even_indices + 1, 0].set(jnp.real(wdata_trans[even_indices, Nf * mult]) / jnp.sqrt(2))
+    wave = wave.at[even_indices, 0].set(
+        jnp.real(wdata_trans[even_indices, 0]) / jnp.sqrt(2)
+    )
+    wave = wave.at[even_indices + 1, 0].set(
+        jnp.real(wdata_trans[even_indices, Nf * mult]) / jnp.sqrt(2)
+    )
 
     # Handle other cases (j > 0) using vectorized operations
     j_range = jnp.arange(1, Nf)
-    odd_condition = ((time_bins[:, None] + j_range[None, :]) % 2 == 1)
+    odd_condition = (time_bins[:, None] + j_range[None, :]) % 2 == 1
 
     wave = wave.at[:, 1:].set(
-        jnp.where(odd_condition,
-                  -jnp.imag(wdata_trans[:, j_range * mult]),
-                  jnp.real(wdata_trans[:, j_range * mult]))
+        jnp.where(
+            odd_condition,
+            -jnp.imag(wdata_trans[:, j_range * mult]),
+            jnp.real(wdata_trans[:, j_range * mult]),
+        )
     )
 
-    return wave.T
+    return wave.T

pywavelet/transforms/jax/forward/main.py

@@ -62,10 +62,10 @@ def from_time_to_wavelet(
 
     mult = min(mult, Nt // 2)  # make sure K isn't bigger than ND
     phi = jnp.array(phi_vec(Nf, d=nx, q=mult))
-    wave = transform_wavelet_time_helper(timeseries.data, Nf=Nf, Nt=Nt, phi=phi, mult=mult)
-    return Wavelet(
-        wave* jnp.sqrt(2), time=t_bins, freq=f_bins
+    wave = transform_wavelet_time_helper(
+        timeseries.data, Nf=Nf, Nt=Nt, phi=phi, mult=mult
     )
+    return Wavelet(wave * jnp.sqrt(2), time=t_bins, freq=f_bins)
 
 
 def from_freq_to_wavelet(
@@ -98,13 +98,9 @@ def from_freq_to_wavelet(
     """
     Nf, Nt = _preprocess_bins(freqseries, Nf, Nt)
     t_bins, f_bins = _get_bins(freqseries, Nf, Nt)
-    phif = jnp.array(phitilde_vec_norm(Nf, Nt,  d=nx))
-    wave =  transform_wavelet_freq_helper(
+    phif = jnp.array(phitilde_vec_norm(Nf, Nt, d=nx))
+    wave = transform_wavelet_freq_helper(
         freqseries.data, Nf=Nf, Nt=Nt, phif=phif
     )
 
-    return Wavelet(
-        (2 / Nf) * wave * jnp.sqrt(2),
-        time=t_bins,
-        freq=f_bins
-    )
+    return Wavelet((2 / Nf) * wave * jnp.sqrt(2), time=t_bins, freq=f_bins)

pywavelet/transforms/jax/inverse/to_freq.py

@@ -1,14 +1,14 @@
+from functools import partial
+
 import jax
 import jax.numpy as jnp
 from jax import jit
 from jax.numpy.fft import fft
 
-from functools import partial
-
 
-@partial(jit, static_argnames=('Nf', 'Nt'))
+@partial(jit, static_argnames=("Nf", "Nt"))
 def inverse_wavelet_freq_helper(
-        wave_in: jnp.ndarray, phif: jnp.ndarray, Nf: int, Nt: int
+    wave_in: jnp.ndarray, phif: jnp.ndarray, Nf: int, Nt: int
 ) -> jnp.ndarray:
     """JAX vectorized function for inverse_wavelet_freq"""
     wave_in = wave_in.T
@@ -20,10 +20,14 @@ def inverse_wavelet_freq_helper(
     n_range = jnp.arange(Nt)
 
     # m == 0 case
-    prefactor2s = prefactor2s.at[0].set(2 ** (-1 / 2) * wave_in[(2 * n_range) % Nt, 0])
+    prefactor2s = prefactor2s.at[0].set(
+        2 ** (-1 / 2) * wave_in[(2 * n_range) % Nt, 0]
+    )
 
     # m == Nf case
-    prefactor2s = prefactor2s.at[Nf].set(2 ** (-1 / 2) * wave_in[(2 * n_range) % Nt + 1, 0])
+    prefactor2s = prefactor2s.at[Nf].set(
+        2 ** (-1 / 2) * wave_in[(2 * n_range) % Nt + 1, 0]
+    )
 
     # Other m cases
     m_mid = m_range[1:Nf]
@@ -67,4 +71,4 @@ def inverse_wavelet_freq_helper(
     res = res.at[i1].add(fft_prefactor2s[m_grid, ind31] * phif[i_ind_grid])
     res = res.at[i2].add(fft_prefactor2s[m_grid, ind32] * phif[i_ind_grid])
 
-    return res
+    return res

pywavelet/transforms/numpy/__init__.py

@@ -1,10 +1,9 @@
 from .forward import from_freq_to_wavelet, from_time_to_wavelet
 from .inverse import from_wavelet_to_freq, from_wavelet_to_time
 
-
 __all__ = [
     "from_wavelet_to_time",
     "from_wavelet_to_freq",
     "from_time_to_wavelet",
     "from_freq_to_wavelet",
-]
+]

pywavelet/transforms/numpy/forward/main.py

@@ -113,7 +113,7 @@ def from_freq_to_wavelet(
     """
     Nf, Nt = _preprocess_bins(freqseries, Nf, Nt)
     t_bins, f_bins = _get_bins(freqseries, Nf, Nt)
-    phif = phitilde_vec_norm(Nf, Nt,  d=nx)
+    phif = phitilde_vec_norm(Nf, Nt, d=nx)
     wave = transform_wavelet_freq_helper(freqseries.data, Nf, Nt, phif)
 
     return Wavelet((2 / Nf) * wave.T * np.sqrt(2), time=t_bins, freq=f_bins)

pywavelet/transforms/numpy/inverse/main.py

@@ -1,7 +1,7 @@
 import numpy as np
 
-from ...phi_computer import phi_vec, phitilde_vec_norm
 from ....types import FrequencySeries, TimeSeries, Wavelet
+from ...phi_computer import phi_vec, phitilde_vec_norm
 from .to_freq import inverse_wavelet_freq_helper_fast
 from .to_time import inverse_wavelet_time_helper_fast
 
@@ -84,7 +84,7 @@ def from_wavelet_to_freq(
     to ensure the proper backwards transformation.
     """
 
-    phif = phitilde_vec_norm(wave_in.Nf, wave_in.Nt,  d=nx)
+    phif = phitilde_vec_norm(wave_in.Nf, wave_in.Nt, d=nx)
     freq_data = inverse_wavelet_freq_helper_fast(
         wave_in.data, phif, wave_in.Nf, wave_in.Nt
     )

pywavelet/transforms/phi_computer.py

@@ -1,10 +1,7 @@
-from ..backend import xp, PI, betainc, ifft
+from ..backend import PI, betainc, ifft, xp
 
 
-
-def phitilde_vec(
-    omega: xp.ndarray, Nf: int, d: float = 4.0
-) -> xp.ndarray:
+def phitilde_vec(omega: xp.ndarray, Nf: int, d: float = 4.0) -> xp.ndarray:
     """Compute phi_tilde(omega_i) array, nx is filter steepness, defaults to 4.
 
     Eq 11 of https://arxiv.org/pdf/2009.00043.pdf (Cornish et al. 2020)
@@ -78,7 +75,7 @@ def __nu_d(
     return betainc(d, d, x) / betainc(d, d, 1)
 
 
-def phitilde_vec_norm(Nf: int, Nt: int,  d: float) -> xp.ndarray:
+def phitilde_vec_norm(Nf: int, Nt: int, d: float) -> xp.ndarray:
     """Normalize phitilde for inverse frequency domain transform."""
 
     # Calculate the frequency values
@@ -86,7 +83,7 @@ def phitilde_vec_norm(Nf: int, Nt: int,  d: float) -> xp.ndarray:
     omegas = 2 * xp.pi / ND * xp.arange(0, Nt // 2 + 1)
 
     # Calculate the unnormalized phitilde (u_phit)
-    u_phit = phitilde_vec(omegas, Nf,  d)
+    u_phit = phitilde_vec(omegas, Nf, d)
 
     # Normalize the phitilde
     normalising_factor = PI ** (-1 / 2)  # Ollie's normalising factor
@@ -129,13 +126,9 @@ def phi_vec(Nf: int, d: float = 4.0, q: int = 16) -> xp.ndarray:
 
     DX = DX.copy()
     # postive frequencies
-    DX[1 : half_K + 1] = phitilde_vec(
-        dom * xp.arange(1, half_K + 1), Nf, d
-    )
+    DX[1 : half_K + 1] = phitilde_vec(dom * xp.arange(1, half_K + 1), Nf, d)
     # negative frequencies
-    DX[half_K + 1 :] = phitilde_vec(
-        -dom * xp.arange(half_K - 1, 0, -1), Nf,  d
-    )
+    DX[half_K + 1 :] = phitilde_vec(-dom * xp.arange(half_K - 1, 0, -1), Nf, d)
     DX = K * ifft(DX, K)
 
     phi = xp.zeros(K)

pywavelet/types/common.py

@@ -1,6 +1,7 @@
-from typing import Tuple, Union, Callable
-from ..logger import logger
+from typing import Callable, Tuple, Union
+
 from ..backend import xp
+from ..logger import logger
 
 
 def _len_check(d):
@@ -8,7 +9,7 @@ def _len_check(d):
         logger.warning(f"Data length {len(d)} is suggested to be a power of 2")
 
 
-def is_documented_by(original:Callable):
+def is_documented_by(original: Callable):
     def wrapper(target):
         target.__doc__ = original.__doc__
         return target

pywavelet/types/frequencyseries.py

@@ -2,7 +2,7 @@ from typing import Optional, Tuple, Union
 
 import matplotlib.pyplot as plt
 
-from ..backend import xp, irfft
+from ..backend import irfft, xp
 from .common import fmt_pow2, fmt_time, is_documented_by
 from .plotting import plot_freqseries, plot_periodogram
 

pywavelet/types/timeseries.py

@@ -4,15 +4,9 @@ import matplotlib.pyplot as plt
 from scipy.signal import butter, sosfiltfilt
 from scipy.signal.windows import tukey
 
+from ..backend import rfft, rfftfreq, xp
 from ..logger import logger
-from .common import (
-    fmt_pow2,
-    fmt_time,
-    fmt_timerange,
-    is_documented_by,
-)
-from ..backend import xp, rfftfreq, rfft
-
+from .common import fmt_pow2, fmt_time, fmt_timerange, is_documented_by
 from .plotting import plot_spectrogram, plot_timeseries
 
 __all__ = ["TimeSeries"]
@@ -272,9 +266,9 @@ class TimeSeries:
         sos = butter(
             bandpass_order, Wn=fmin, btype="highpass", output="sos", fs=self.fs
         )
-        window = tukey(self.ND, alpha=tukey_window_alpha)
         data = self.data.copy()
-        data = sosfiltfilt(sos, data * window)
+        data = sosfiltfilt(sos, data)
+        data = data * tukey(self.ND, alpha=tukey_window_alpha)
         return TimeSeries(data, self.time)
 
     def __copy__(self):

pywavelet/types/wavelet_bins.py

@@ -1,7 +1,6 @@
 from typing import Tuple, Union
 
 from ..backend import xp
-
 from .frequencyseries import FrequencySeries
 from .timeseries import TimeSeries
 

pywavelet/utils.py

@@ -71,6 +71,8 @@ def compute_likelihood(
     p = psd.data
     if mask is not None:
         m = mask.mask
+        # convert mask to numbers -- 0 for False, 1 for True
+        m = m.astype(int)
         d, h, p = d * m, h * m, p * m
 
     return -0.5 * np.nansum((d - h) ** 2 / p)

{pywavelet-0.2.4.dist-info → pywavelet-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywavelet
-Version: 0.2.4
+Version: 0.2.5
 Summary: WDM wavelet transform your time/freq series!
 Author-email: Pywavelet Team <avi.vajpeyi@gmail.com>
 Project-URL: Homepage, https://pywavelet.github.io/pywavelet/
@@ -76,10 +76,10 @@ First set up a conda environment with the latest version of python.
 Test code
 ---------
 
-Locate directory /tests from root directory. run 
+Locate directory /tests from root directory. run
 
 .. code-block::
 
     $ pytest .
 
-Hopefully everything should run fine. 
+Hopefully everything should run fine.

{pywavelet-0.2.4.dist-info → pywavelet-0.2.5.dist-info}/RECORD

@@ -1,35 +1,35 @@
 pywavelet/__init__.py,sha256=zcK3Qj4wTrGZF1rU3aT6yA9LvliAOD4DVOY7gNfHhCI,53
-pywavelet/_version.py,sha256=4gL0W4-u58XR5lRLpeoIPrGhcewTk0-527de6uTNmkg,411
+pywavelet/_version.py,sha256=8n5F0z2KUdXF-kMA1VxiH6w0elyZUUWXosPRzNz_3I0,411
 pywavelet/backend.py,sha256=SmpgIBHvTO1rtIAQQN_zpVB8i6R-x23FNKJG6_JlrNs,666
 pywavelet/logger.py,sha256=DyKC-pJ_N9GlVeXL00E1D8hUd8GceBg-pnn7g1YPKcM,391
-pywavelet/utils.py,sha256=l47C643nGlV9q4a0G7wtKzuas0Ou4En2e1FTATCgwlw,1907
+pywavelet/utils.py,sha256=FqQ6V41WGHMbLC4wv_1xnwHjOPDVSWnG78sAeqbYtYU,1994
 pywavelet/transforms/__init__.py,sha256=EYX8glRWojYbrjtbgrjS4vigYTRi7FOtIV3D1UwI5fY,604
-pywavelet/transforms/phi_computer.py,sha256=ppFSGJwtNnO2flaiok9ms3WXlAxGQikvA7eNfLgriNQ,4461
+pywavelet/transforms/phi_computer.py,sha256=d39RfU-7Zbdo4GnmvrV21fXnFLEtf1ccPX_mBHg96Lw,4423
 pywavelet/transforms/jax/__init__.py,sha256=D_f-JgFAzOIJ-EuQZhTMziD4MT6lVWS3XV9s51Cu7Kg,335
 pywavelet/transforms/jax/forward/__init__.py,sha256=E_A8plyfTSKDRXlAAvdiRMTe9f3Y6MbK3pXMHFg8mr0,121
 pywavelet/transforms/jax/forward/from_freq.py,sha256=tKEdqPyEvX8ZKVQf16wGxN3d6gkcjm_RtAHQuWHUzy4,3764
-pywavelet/transforms/jax/forward/from_time.py,sha256=xNeoZq54B6Gi3TdTTYLr_euaFeJcwpms-lSyCG53AdI,1726
-pywavelet/transforms/jax/forward/main.py,sha256=mm0R4m0pXcnzZB0jCckAc4ynG8STH5mldCmHyyU_PGo,3091
+pywavelet/transforms/jax/forward/from_time.py,sha256=4RZ8-ah0qOMP20i3-xThVWddxa1QTCvZKnGpNAJbb0g,1765
+pywavelet/transforms/jax/forward/main.py,sha256=7gpHUycEclDwlb6KpLqUZoIkhJjPH0sBITBGVqepYAI,3061
 pywavelet/transforms/jax/inverse/__init__.py,sha256=J4KIzPzbHNg_8fV_c1MpPq3slSqHQV0j3VFrjfd1Nog,121
 pywavelet/transforms/jax/inverse/main.py,sha256=-HVOOBsYo3GJvGNCsQLbNPnt9s14JvbB2bGAd9LOr3A,1647
-pywavelet/transforms/jax/inverse/to_freq.py,sha256=ASNARcDBJQr4EizAP_77e5ai36iPwP6hzfvwGbZQ6BM,2295
-pywavelet/transforms/numpy/__init__.py,sha256=qFLpGpW3VJSbDp2JpD0Gx7PdwDjH-wrW_aO84ASkIgA,255
+pywavelet/transforms/jax/inverse/to_freq.py,sha256=y27Lx797Hcmg3gZLS1IpoyRalmJk54my91farO6G64M,2320
+pywavelet/transforms/numpy/__init__.py,sha256=1Ibsup9UwMajeZ9NCQ4BN15qZTeJ_EHkgGu8XNFdA18,255
 pywavelet/transforms/numpy/forward/__init__.py,sha256=E_A8plyfTSKDRXlAAvdiRMTe9f3Y6MbK3pXMHFg8mr0,121
 pywavelet/transforms/numpy/forward/from_freq.py,sha256=JmJyjrNSb64WnpP50VZRt0BICP64iZJP5QAZTZoexkw,2675
 pywavelet/transforms/numpy/forward/from_time.py,sha256=-Y6VEKwDCYBAHAjLdO46vT-6alpM5fXTgTZ_xkYxqA8,2381
-pywavelet/transforms/numpy/forward/main.py,sha256=3y-YCnhpvN7M4N7xy3CVts7n3QQPwDcJ6mkklX1QbFM,3973
+pywavelet/transforms/numpy/forward/main.py,sha256=1YCwBuhWAPFyah-XHT5Q98rMjVtoSnaEvH3sl6NWWmA,3972
 pywavelet/transforms/numpy/inverse/__init__.py,sha256=J4KIzPzbHNg_8fV_c1MpPq3slSqHQV0j3VFrjfd1Nog,121
-pywavelet/transforms/numpy/inverse/main.py,sha256=-11U5tnDizIssHk824rpYrzbJRl6WFpH6K2KKpVpDnU,2989
+pywavelet/transforms/numpy/inverse/main.py,sha256=rzPsukcvOgN4vqtTpVxNSb-60KT-L-1AYr3_OSeDulk,2988
 pywavelet/transforms/numpy/inverse/to_freq.py,sha256=so_TDbwdS1N8sd1QcpeAEkI10XFDtoFJGohtD4YulZM,2809
 pywavelet/transforms/numpy/inverse/to_time.py,sha256=w5vmImdsb_4YeInZtXh0llsThLTxS0tmYDlNGJ-IUew,5080
 pywavelet/types/__init__.py,sha256=5YptzQvYBnRfC8N5lpOBf9I1lzpJ0pw0QMnvIcwP3YI,122
-pywavelet/types/common.py,sha256=aIcYq-0KOLHnPQjrVbVmw_TQ3Xm5a7xA30rSgwt3rk4,1275
-pywavelet/types/frequencyseries.py,sha256=hrtLaIUaRrqXw8l00yFe2tPJwpksDa_4n1z6R8XSPPQ,7531
+pywavelet/types/common.py,sha256=_SMmXLrRO0Nw_A7Oa6C10kZAbj8jq9agXx7tMDjnYJg,1277
+pywavelet/types/frequencyseries.py,sha256=tAbZr0vEBCe0MwH7ZjaK00UVupjRNxvjoW9LCMsiiMo,7531
 pywavelet/types/plotting.py,sha256=JNDxeP-fB8U09E90J-rVT-h5yCGA_tGRHtctbgINiRo,10625
-pywavelet/types/timeseries.py,sha256=u35bIqFo3QdlQRBEu6maeWA7DePS11LQ6WMiLjZPcWo,9456
+pywavelet/types/timeseries.py,sha256=sataMW4BPFqi23h_NBZ_U9-Svuo9pLXVRmUJI6KTXG0,9430
 pywavelet/types/wavelet.py,sha256=uHJzTS2ZXTRr7I7NHWv3qNjknSBhQUpcED3jM6ti7UM,13587
-pywavelet/types/wavelet_bins.py,sha256=GoQGKeZlPc-KbYY7LoxAhB-HI4diHpPcTABBXRfUTLA,1459
-pywavelet-0.2.4.dist-info/METADATA,sha256=Thhhz8I2XTKr0mVuf09UpcvjeEGKUnVUX0jxENu6gEQ,2241
-pywavelet-0.2.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pywavelet-0.2.4.dist-info/top_level.txt,sha256=g0Ezt0Rg0X-nrd-a0pAXKVRkuWNsF2M9Ynsjb9b2UYQ,10
-pywavelet-0.2.4.dist-info/RECORD,,
+pywavelet/types/wavelet_bins.py,sha256=gBjhWwfjcbbSnbGZVMNUeFFVUo2DVxJS4abDUVCL7ts,1458
+pywavelet-0.2.5.dist-info/METADATA,sha256=jfqO4IRwiYgyhfGvE9Wrbpw4t5P6L8kuLgAA7W82Jls,2239
+pywavelet-0.2.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pywavelet-0.2.5.dist-info/top_level.txt,sha256=g0Ezt0Rg0X-nrd-a0pAXKVRkuWNsF2M9Ynsjb9b2UYQ,10
+pywavelet-0.2.5.dist-info/RECORD,,