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

pywavelet/types/plotting.py

@@ -84,6 +84,7 @@ def plot_wavelet_grid(
     nan_color: Optional[str] = "black",
     detailed_axes: bool = False,
     show_gridinfo: bool = True,
+    txtbox_kwargs: dict = {},
     trend_color: Optional[str] = None,
     whiten_by: Optional[np.ndarray] = None,
     **kwargs,
@@ -172,12 +173,17 @@ def plot_wavelet_grid(
             if np.all(np.isnan(z)):
                 raise ValueError("All wavelet data is NaN.")
             if zscale == "log":
-                norm = LogNorm(
-                    vmin=np.nanmin(z[z > 0]), vmax=np.nanmax(z[z < np.inf])
-                )
+                vmin = np.nanmin(z[z > 0])
+                vmax = np.nanmax(z[z < np.inf])
+                if vmin > vmax:
+                    raise ValueError("vmin > vmax... something wrong")
+                norm = LogNorm(vmin=vmin, vmax=vmax)
             elif not absolute:
                 vmin, vmax = np.nanmin(z), np.nanmax(z)
                 vcenter = 0.0
+                if vmin > vmax:
+                    raise ValueError("vmin > vmax... something wrong")
+
                 norm = TwoSlopeNorm(vmin=vmin, vcenter=vcenter, vmax=vmax)
             else:
                 norm = None  # Default linear scaling
@@ -248,6 +254,9 @@ def plot_wavelet_grid(
     NfNt_label = f"{Nf}x{Nt}" if show_gridinfo else ""
     txt = f"{label}\n{NfNt_label}" if label else NfNt_label
     if txt:
+        txtbox_kwargs.setdefault("boxstyle", "round")
+        txtbox_kwargs.setdefault("facecolor", "white")
+        txtbox_kwargs.setdefault("alpha", 0.2)
         ax.text(
             0.05,
             0.95,
@@ -255,7 +264,7 @@ def plot_wavelet_grid(
             transform=ax.transAxes,
             fontsize=14,
             verticalalignment="top",
-            bbox=dict(boxstyle="round", facecolor=None, alpha=0.2),
+            bbox=txtbox_kwargs,
         )
 
     # Adjust layout
@@ -294,7 +303,7 @@ def plot_periodogram(
     flow = np.min(np.abs(freq))
     ax.set_xlabel("Frequency [Hz]")
     ax.set_ylabel("Periodigram")
-    ax.set_xlim(left=flow, right=nyquist_frequency / 2)
+    # ax.set_xlim(left=flow, right=nyquist_frequency / 2)
     return ax.figure, ax
 
 

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.py

@@ -477,13 +477,13 @@ class WaveletMask(Wavelet):
             A WaveletMask object with the specified restrictions.
         """
         self = cls.zeros_from_grid(time_grid, freq_grid)
-        self.data[
-            (freq_grid >= frange[0]) & (freq_grid <= frange[1]), :
-        ] = True
+        self.data[(freq_grid >= frange[0]) & (freq_grid <= frange[1]), :] = (
+            True
+        )
 
         for tgap in tgaps:
-            self.data[
-                :, (time_grid >= tgap[0]) & (time_grid <= tgap[1])
-            ] = False
+            self.data[:, (time_grid >= tgap[0]) & (time_grid <= tgap[1])] = (
+                False
+            )
         self.data = self.data.astype(bool)
         return 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.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pywavelet
-Version: 0.2.4
+Version: 0.2.6
 Summary: WDM wavelet transform your time/freq series!
 Author-email: Pywavelet Team <avi.vajpeyi@gmail.com>
 Project-URL: Homepage, https://pywavelet.github.io/pywavelet/
@@ -11,7 +11,7 @@ Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 Requires-Dist: numpy
 Requires-Dist: numba
@@ -21,6 +21,12 @@ Requires-Dist: tqdm
 Requires-Dist: rich
 Requires-Dist: rocket-fft
 Requires-Dist: astropy>=5.2.1
+Requires-Dist: jaxtyping
+Requires-Dist: beartype
+Provides-Extra: jax
+Requires-Dist: jax; extra == "jax"
+Provides-Extra: cupy
+Requires-Dist: cupy; extra == "cupy"
 Provides-Extra: dev
 Requires-Dist: pytest>=6.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.1.0; extra == "dev"
@@ -32,8 +38,7 @@ Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: jupyter-book; extra == "dev"
 Requires-Dist: GitPython; extra == "dev"
-Provides-Extra: jax
-Requires-Dist: jax; extra == "jax"
+Requires-Dist: nbconvert; extra == "dev"
 
 pywavelet
 #########
@@ -59,27 +64,33 @@ pywavelet is available on PyPI and can be installed with `pip <https://pip.pypa.
 
     $ pip install pywavelet
 
+
+Note: We have transforms availible in numpy, JAX and Cupy.
+
+
 For developers
 --------------
 
-First set up a conda environment with the latest version of python.
+First set up a conda environment with python 3.10
 
 .. code-block::
 
-    $ conda create -n pywavelet -c conda-forge python=3.12
+    $ mamba create -n pywavelet python=3.10
 
 .. code-block::
 
+    $ CONDA_OVERRIDE_CUDA=12.4  mamba install "jaxlib=*=*cuda*" jax -c conda-forge
+    $ CONDA_OVERRIDE_CUDA=12.4  conda install -c conda-forge cupy-core
     $ pip install -e ".[dev]"
     $ pre-commit install
 
 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.6.dist-info/RECORD

@@ -0,0 +1,43 @@
+pywavelet/__init__.py,sha256=K7pQ8W2w9d5qwI4KzPdTpRn5-YaUfMpjnJmg7oQnYSM,508
+pywavelet/_version.py,sha256=nObnONsicQ3YX6SG5MVBxmIp5dmRacXDauSqZijWQbY,511
+pywavelet/backend.py,sha256=1AjwqoIlan6vNFZcon_LIVsiPH8HrWQwU3RON7dnjUE,1585
+pywavelet/logger.py,sha256=DyKC-pJ_N9GlVeXL00E1D8hUd8GceBg-pnn7g1YPKcM,391
+pywavelet/utils.py,sha256=FqQ6V41WGHMbLC4wv_1xnwHjOPDVSWnG78sAeqbYtYU,1994
+pywavelet/transforms/__init__.py,sha256=t4cHI8Rd5UnLwqCunr4sCQRmsKhHOnZ5VqkDphhi-VM,784
+pywavelet/transforms/phi_computer.py,sha256=jVxeWtfx5P1H-_HdMsK7xHuINZAjH9bj7cA8CJ98isw,3667
+pywavelet/transforms/cupy/__init__.py,sha256=8BBE6msB071WdstA860a7g64C0aHT2PZsqfEgP6nmkA,336
+pywavelet/transforms/cupy/forward/__init__.py,sha256=E_A8plyfTSKDRXlAAvdiRMTe9f3Y6MbK3pXMHFg8mr0,121
+pywavelet/transforms/cupy/forward/from_freq.py,sha256=GoKpg019o0Ld5QqkHOt8bpzV_w74Nii__y4tIhNcuV4,3513
+pywavelet/transforms/cupy/forward/from_time.py,sha256=Og9l0KurMUdbBPyvZcP1znGimMcKBgzywF0nPLTNBes,1524
+pywavelet/transforms/cupy/forward/main.py,sha256=g2Pl-j4LBg7GLlzzCSoCGuEd6NNCckJ4UvC-Pppky2w,3071
+pywavelet/transforms/cupy/inverse/__init__.py,sha256=J4KIzPzbHNg_8fV_c1MpPq3slSqHQV0j3VFrjfd1Nog,121
+pywavelet/transforms/cupy/inverse/main.py,sha256=5pTtGNNdwlSGDQV4sqGyzUPnmqFUgFOFUFfpqjZx07Q,1608
+pywavelet/transforms/cupy/inverse/to_freq.py,sha256=gpqu5Y65ZvuET5jANp6UAuAamg2PRkpAlaAjWPh7uBk,1835
+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=XYtRziPD7MCbeKf4HAucQrMzko4T0zmNV7jg5bziVwA,3910
+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=_NAoEAjjEzbIcUOEEfriycZW6_a6yhGiKdtpU52H8i8,1568
+pywavelet/transforms/jax/inverse/to_freq.py,sha256=x_Apiob0ZSg7UAhDSyKPxFAZXijWABJxzla526kuD8Y,3184
+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=UNf0mLdaN9XrrHPYIiLEzdAwElReZJHzZtuykSZE9iU,4556
+pywavelet/transforms/numpy/forward/from_time.py,sha256=-Y6VEKwDCYBAHAjLdO46vT-6alpM5fXTgTZ_xkYxqA8,2381
+pywavelet/transforms/numpy/forward/main.py,sha256=M4ELrzDone4XVO54Yf3_khTEFjVaeykES31kwhLubyU,3949
+pywavelet/transforms/numpy/inverse/__init__.py,sha256=J4KIzPzbHNg_8fV_c1MpPq3slSqHQV0j3VFrjfd1Nog,121
+pywavelet/transforms/numpy/inverse/main.py,sha256=3Lxxhh9VnElToaTJHgpWE-BFzKQrGEQFupnoSgJzKfk,2972
+pywavelet/transforms/numpy/inverse/to_freq.py,sha256=lgb0p0M9wuhsB1mjvzqKZXuorhMickvkqO4T0A5bE_E,4914
+pywavelet/transforms/numpy/inverse/to_time.py,sha256=w5vmImdsb_4YeInZtXh0llsThLTxS0tmYDlNGJ-IUew,5080
+pywavelet/types/__init__.py,sha256=5YptzQvYBnRfC8N5lpOBf9I1lzpJ0pw0QMnvIcwP3YI,122
+pywavelet/types/common.py,sha256=_SMmXLrRO0Nw_A7Oa6C10kZAbj8jq9agXx7tMDjnYJg,1277
+pywavelet/types/frequencyseries.py,sha256=tAbZr0vEBCe0MwH7ZjaK00UVupjRNxvjoW9LCMsiiMo,7531
+pywavelet/types/plotting.py,sha256=qjv5IeuSEc9WWkfJYvz1eQRgTKTspWxj4lwB5N69SbU,11002
+pywavelet/types/timeseries.py,sha256=sataMW4BPFqi23h_NBZ_U9-Svuo9pLXVRmUJI6KTXG0,9430
+pywavelet/types/wavelet.py,sha256=lDhpy9bEb_I-YDQbI3elaWuU8l9E2P6wDcuAQONv8lA,13591
+pywavelet/types/wavelet_bins.py,sha256=gBjhWwfjcbbSnbGZVMNUeFFVUo2DVxJS4abDUVCL7ts,1458
+pywavelet-0.2.6.dist-info/METADATA,sha256=WScrhO_gC_5wKwY39T0aI81YBj71xn9O6-MI0GBRucQ,2571
+pywavelet-0.2.6.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+pywavelet-0.2.6.dist-info/top_level.txt,sha256=g0Ezt0Rg0X-nrd-a0pAXKVRkuWNsF2M9Ynsjb9b2UYQ,10
+pywavelet-0.2.6.dist-info/RECORD,,

{pywavelet-0.2.4.dist-info → pywavelet-0.2.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pywavelet-0.2.4.dist-info/RECORD

@@ -1,35 +0,0 @@
-pywavelet/__init__.py,sha256=zcK3Qj4wTrGZF1rU3aT6yA9LvliAOD4DVOY7gNfHhCI,53
-pywavelet/_version.py,sha256=4gL0W4-u58XR5lRLpeoIPrGhcewTk0-527de6uTNmkg,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/transforms/__init__.py,sha256=EYX8glRWojYbrjtbgrjS4vigYTRi7FOtIV3D1UwI5fY,604
-pywavelet/transforms/phi_computer.py,sha256=ppFSGJwtNnO2flaiok9ms3WXlAxGQikvA7eNfLgriNQ,4461
-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/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/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/inverse/__init__.py,sha256=J4KIzPzbHNg_8fV_c1MpPq3slSqHQV0j3VFrjfd1Nog,121
-pywavelet/transforms/numpy/inverse/main.py,sha256=-11U5tnDizIssHk824rpYrzbJRl6WFpH6K2KKpVpDnU,2989
-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/plotting.py,sha256=JNDxeP-fB8U09E90J-rVT-h5yCGA_tGRHtctbgINiRo,10625
-pywavelet/types/timeseries.py,sha256=u35bIqFo3QdlQRBEu6maeWA7DePS11LQ6WMiLjZPcWo,9456
-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,,