pywavelet 0.0.5__py3-none-any.whl → 0.1.0__py3-none-any.whl

pywavelet/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.5'
-__version_tuple__ = version_tuple = (0, 0, 5)
+__version__ = version = '0.1.0'
+__version_tuple__ = version_tuple = (0, 1, 0)

pywavelet/transforms/types/__init__.py

@@ -1,3 +1,4 @@
 from .frequencyseries import FrequencySeries
 from .timeseries import TimeSeries
 from .wavelet import Wavelet
+from .wavelet_mask import WaveletMask

pywavelet/transforms/types/wavelet_mask.py

@@ -0,0 +1,34 @@
+from typing import List
+
+from .common import fmt_timerange, is_documented_by, xp
+
+
+class WaveletMask:
+    def __init__(
+        self,
+        mask: xp.ndarray,
+        time: xp.ndarray,
+        freq: xp.ndarray,
+    ):
+        self.mask = mask
+        self.time = time
+        self.freq = freq
+
+    def __repr__(self):
+        return f"WaveletMask({self.mask.shape}, {fmt_timerange(self.time)}, {self.freq})"
+
+    @classmethod
+    def from_grid(cls, time_grid: xp.ndarray, freq_grid: xp.ndarray):
+        nt, nf = len(time_grid), len(freq_grid)
+        mask = xp.zeros((nf, nt), dtype=bool)
+        return cls(mask, time_grid, freq_grid)
+
+    @classmethod
+    def from_frange(
+        cls, time_grid: xp.ndarray, freq_grid: xp.ndarray, frange: List[float]
+    ):
+        self = cls.from_grid(time_grid, freq_grid)
+        self.mask[
+            (freq_grid >= frange[0]) & (freq_grid <= frange[1]), :
+        ] = True
+        return self

pywavelet/utils.py

@@ -3,7 +3,7 @@ from typing import Union
 import numpy as np
 from scipy.interpolate import interp1d
 
-from .transforms.types import FrequencySeries, TimeSeries, Wavelet
+from .transforms.types import FrequencySeries, TimeSeries, Wavelet, WaveletMask
 
 DATA_TYPE = Union[TimeSeries, FrequencySeries, Wavelet]
 
@@ -34,10 +34,13 @@ def evolutionary_psd_from_stationary_psd(
     return Wavelet(psd_grid.T, time=t_grid, freq=f_grid)
 
 
-def noise_weighted_inner_product(d: Wavelet, h: Wavelet, PSD: Wavelet) -> float:
+def noise_weighted_inner_product(
+    d: Wavelet, h: Wavelet, PSD: Wavelet
+) -> float:
     return np.nansum((d.data * h.data) / PSD.data)
 
-def compute_snr(d:Wavelet, h: Wavelet, PSD: Wavelet) -> float:
+
+def compute_snr(d: Wavelet, h: Wavelet, PSD: Wavelet) -> float:
     """Compute the SNR of a model h[ti,fi] given freqseries d[ti,fi] and PSD[ti,fi].
 
     SNR(h) = Sum_{ti,fi} [ h_hat[ti,fi] d[ti,fi] / PSD[ti,fi]
@@ -60,5 +63,14 @@ def compute_snr(d:Wavelet, h: Wavelet, PSD: Wavelet) -> float:
     return np.sqrt(noise_weighted_inner_product(d, h, PSD))
 
 
-def compute_likelihood(data:Wavelet, template:Wavelet, psd:Wavelet) -> float:
-    return -0.5 * np.nansum((data.data - template.data) ** 2 / psd.data)
+def compute_likelihood(
+    data: Wavelet, template: Wavelet, psd: Wavelet, mask: WaveletMask = None
+) -> float:
+    d = data.data
+    h = template.data
+    p = psd.data
+    if mask is not None:
+        m = mask.mask
+        d, h, p = d * m, h * m, p * m
+
+    return -0.5 * np.nansum((d - h) ** 2 / p)

{pywavelet-0.0.5.dist-info → pywavelet-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywavelet
-Version: 0.0.5
+Version: 0.1.0
 Summary: WDM wavelet transform your time/freq series!
 Author-email: Pywavelet Team <avi.vajpeyi@gmail.com>
 Project-URL: Homepage, https://pywavelet.github.io/pywavelet/

{pywavelet-0.0.5.dist-info → pywavelet-0.1.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pywavelet/__init__.py,sha256=zcK3Qj4wTrGZF1rU3aT6yA9LvliAOD4DVOY7gNfHhCI,53
-pywavelet/_version.py,sha256=EJB7__SNK9kQS_SWZB_U4DHJ3P8ftF6etZEihTYnuXE,411
+pywavelet/_version.py,sha256=IMl2Pr_Sy4LVRKy_Sm4CdwUl1Gryous6ncL96EMYsnM,411
 pywavelet/logger.py,sha256=u5Et6QLUU0IuTnPnxfev5-4GYmihTo7_yBCTf-rVUsA,377
-pywavelet/utils.py,sha256=rbmZ-PrnFstq05kh6xj8emuQ3-7oXqZinU03bpg3N7A,1746
+pywavelet/utils.py,sha256=-fZULV8ze1cxs0SP03Di-naYPgNvHbADsFrJ6Vzi7aE,1918
 pywavelet/transforms/__init__.py,sha256=FolK8WiVEJmGDC9xMupYVI_essXaXS4LYWKbqEqGx6o,289
 pywavelet/transforms/phi_computer.py,sha256=vo1PK9Z70kKV-1lfyRoxWdhSYqwIgJK5CRCCJVei3xI,4545
 pywavelet/transforms/forward/__init__.py,sha256=Yq4Tg3Ze98-17C9FIkOqMUdiLHe9x_YoyuRvxOxMOP0,176
@@ -13,13 +13,14 @@ pywavelet/transforms/inverse/__init__.py,sha256=J4KIzPzbHNg_8fV_c1MpPq3slSqHQV0j
 pywavelet/transforms/inverse/main.py,sha256=l5yFvzmWObrO5Xt_8KYp62w829ab0pQLxcv0-QxkvG0,3015
 pywavelet/transforms/inverse/to_freq.py,sha256=SExZMax-8A-tJpIA86pYY61X2qvlZ2MrZY27uzCQSV0,2778
 pywavelet/transforms/inverse/to_time.py,sha256=BAYvrr41QHIbzwYMPyMnzv5mqSx40YigmBruWBwtZwc,5041
-pywavelet/transforms/types/__init__.py,sha256=4wUTVBk6A02xjZUY_w056eUZurYI9vVfa--I3Q6Udng,109
+pywavelet/transforms/types/__init__.py,sha256=bNw6gb1S7aA1-wl38LEL7j0BhJBJveYDt2ERn-0kU4k,147
 pywavelet/transforms/types/common.py,sha256=sLBn2d9cuL6NYeIv6NIogDjY6rYPZAPzCtWGwMlAwkI,1290
 pywavelet/transforms/types/frequencyseries.py,sha256=Rtwt486UL0-TgMAdcMMVpyfi5PSLzxFcdE_RsYuyxQk,7463
 pywavelet/transforms/types/plotting.py,sha256=aEIFoSuQRYwYc2639yLkbujXx_aav5A5tXG29rOSMOQ,10275
 pywavelet/transforms/types/timeseries.py,sha256=Nl1tiKZ7kwu-EZ5JtubwgzgyjQZR86eGU3C3kElIPNg,9296
 pywavelet/transforms/types/wavelet.py,sha256=raODhyegBd1_esuv2YP6tK_Nj9fYaLQ6O4pxpiFAVZU,10790
-pywavelet-0.0.5.dist-info/METADATA,sha256=BaLK8jbUqss_8BeGWOlf_031PoCAlEV4rmuSaitQd0E,1307
-pywavelet-0.0.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pywavelet-0.0.5.dist-info/top_level.txt,sha256=g0Ezt0Rg0X-nrd-a0pAXKVRkuWNsF2M9Ynsjb9b2UYQ,10
-pywavelet-0.0.5.dist-info/RECORD,,
+pywavelet/transforms/types/wavelet_mask.py,sha256=Qst9NQmvr6vx0Tg8TMABRnDdD3iQgiwgaQKqyf0lwfU,937
+pywavelet-0.1.0.dist-info/METADATA,sha256=sCAmMS5b2zEqsetgkkFgb7DopcPjn_V1o1y3uzIAEEE,1307
+pywavelet-0.1.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pywavelet-0.1.0.dist-info/top_level.txt,sha256=g0Ezt0Rg0X-nrd-a0pAXKVRkuWNsF2M9Ynsjb9b2UYQ,10
+pywavelet-0.1.0.dist-info/RECORD,,