lisaanalysistools 1.0.4__cp312-cp312-macosx_10_9_x86_64.whl → 1.0.5__cp312-cp312-macosx_10_9_x86_64.whl

{lisaanalysistools-1.0.4.dist-info → lisaanalysistools-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.4
+Version: 1.0.5
 Home-page: https://github.com/mikekatz04/lisa-on-gpu
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -60,7 +60,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms/tags).
 
-Current Version: 1.0.4
+Current Version: 1.0.5
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.4.dist-info → lisaanalysistools-1.0.5.dist-info}/RECORD

@@ -1,11 +1,10 @@
 lisatools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/_version.py,sha256=ZyRiY_EiNuQjMpqN7rHllKpqA3B9m-CTwI9pWBKukog,123
+lisatools/_version.py,sha256=QnhTB8xNwmBZijHj3vbB3rZZAVZJsQdBQ0N3zLG2pMY,123
 lisatools/analysiscontainer.py,sha256=ePwTBUTEBJn2TK93_afARate9SAqUKK8c8T6DcGUx1Y,15321
 lisatools/datacontainer.py,sha256=W89ErPJynfeioZwYqcpehHVorhKsb8FLKrj69zIsKKU,9187
-lisatools/detector.py,sha256=Ht5v-Iq_DJlCWMt9iSbZwmEwTGwd3pdeOaw4lBtmiBQ,13852
+lisatools/detector.py,sha256=_S7fmtOaFLIzTfVnVTXjD58rvl7-DVy2WR4aG1V-CsE,13851
 lisatools/diagnostic.py,sha256=CfPpfvDys1XyZRWmmTqTSWb0SY2eH0G_8TRnt1OxBFo,34174
-lisatools/glitch.py,sha256=qMNSqdmGqdm6kVtZP9qncP_40DyPj9ushbXh88g9wlU,5154
-lisatools/sensitivity.py,sha256=eYSqM3Kr5UsAhqR3J5DWQBGaavL5dGO1ouWpbhMwhao,27263
+lisatools/sensitivity.py,sha256=rckXeJ_5U3cRRgbYDmt0kaTyJRjkrYfgBwos12QJJfw,27297
 lisatools/stochastic.py,sha256=wdiToEj4nUpCDIb0j7vQ7netTPDDtPGPbUg8-RiFA9U,9421
 lisatools/cutils/detector.cpython-312-darwin.so,sha256=FguczB3QPZfL3CCSMEuIx3VP0jj240_Dh30anER84m8,121664
 lisatools/sampling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -14,24 +13,16 @@ lisatools/sampling/prior.py,sha256=1K1PMStpwO9WT0qG0aotKSyoNjuehXNbzTDtlk8Q15M,2
 lisatools/sampling/stopping.py,sha256=Q8q7nM0wnJervhRduf2tBXZZHUVza5kJiAUAMUQXP5o,9682
 lisatools/sampling/utility.py,sha256=rOGotS0Aj8-DAWqsTVy2xWNsxsoz74BVrHEnG2mOkwU,14340
 lisatools/sampling/moves/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/sampling/moves/gbgroupstretch.py,sha256=mgczS3qpcro5J3M501yHg9GwGNHsuMCtNZVywA_w8pM,1220
-lisatools/sampling/moves/gbmultipletryrj.py,sha256=KXOB1GinZw1uXQPxnXk7tzEcUfY7OCTBTtEB0T2Dg-s,51802
-lisatools/sampling/moves/gbspecialgroupstretch.py,sha256=m-73giWE_oaIlscXZrNNu9Ab_fyRBkKhn0kkzA3BY24,31152
-lisatools/sampling/moves/gbspecialstretch.py,sha256=K0yoeBveaaB0rmXyhMsRWjR0gABKjpRx4ShhaNcKBuM,90189
-lisatools/sampling/moves/mbhspecialmove.py,sha256=E2dV1HwmBlZYYufowUSAfFiVmljwx1tEX-yXBmFQfVU,14163
-lisatools/sampling/moves/placeholder.py,sha256=CUKKthGMA0UFiifnvNFpvFZfDYWQ_XI0bIbCw0oDeqI,469
 lisatools/sampling/moves/skymodehop.py,sha256=0nf72eFhFMGwi0dLJci6XZz-bIMGqco2B2_J72hQvf8,3348
-lisatools/sampling/moves/specialforegroundmove.py,sha256=b9sdhWSELnBBSTiGU0taHS-e0lth2OepW139ZdP-aAU,25092
 lisatools/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/sources/emri/__init__.py,sha256=HjsWS4mjog_gRE4N90My6ahLKQGjNwrHIeA40R7qzw0,41
 lisatools/sources/emri/tdiwaveform.py,sha256=jaKL2PO8RlJrHP45zCa4BpRniLfdnMIP1QsIB-6jVq4,2297
 lisatools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/utils/constants.py,sha256=r1kVwkpbZS13JTOxj2iRxT5sMgTYX30y-S0JdVmD5Oo,1354
-lisatools/utils/multigpudataholder.py,sha256=6HwkOceqga1Q7eK4TjStGXy4oKgx37hTkdcAwiiZ8_Y,33765
 lisatools/utils/pointeradjust.py,sha256=2sT-7qeYWr1pd_sHk9leVHUTSJ7jJgYIRoWQOtYqguE,2995
 lisatools/utils/utility.py,sha256=3mJoJKNGrm3KuNXIa2RUKi9WKd593V4q9XjjQZCQD0M,6831
-lisaanalysistools-1.0.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lisaanalysistools-1.0.4.dist-info/METADATA,sha256=reVoFCjiQuN-XxTsgR7PW_ROH4yQEkWLeQPxF3adDcw,3380
-lisaanalysistools-1.0.4.dist-info/WHEEL,sha256=KYtn_mzb_QwZSHwPlosUO3fDl70znfUFngLlrLVHeBY,111
-lisaanalysistools-1.0.4.dist-info/top_level.txt,sha256=oCQGY7qy66i_b9MCsK2fTRdbV1pcC9GsGgIDjN47Tyc,14
-lisaanalysistools-1.0.4.dist-info/RECORD,,
+lisaanalysistools-1.0.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lisaanalysistools-1.0.5.dist-info/METADATA,sha256=zfuyj8R4brFWnqruMjtzkbTxmVQ5L9Lelh9zNrslfPs,3380
+lisaanalysistools-1.0.5.dist-info/WHEEL,sha256=KYtn_mzb_QwZSHwPlosUO3fDl70znfUFngLlrLVHeBY,111
+lisaanalysistools-1.0.5.dist-info/top_level.txt,sha256=oCQGY7qy66i_b9MCsK2fTRdbV1pcC9GsGgIDjN47Tyc,14
+lisaanalysistools-1.0.5.dist-info/RECORD,,

lisatools/_version.py

@@ -1,4 +1,4 @@
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 __copyright__ = "Michael L. Katz 2024"
 __name__ = "lisaanalysistools"
 __author__ = "Michael L. Katz"

lisatools/detector.py

@@ -443,7 +443,7 @@ class LISAModel(LISAModelSettings, ABC):
 scirdv1 = LISAModel((15.0e-12) ** 2, (3.0e-15) ** 2, DefaultOrbits(), "scirdv1")
 proposal = LISAModel((10.0e-12) ** 2, (3.0e-15) ** 2, DefaultOrbits(), "proposal")
 mrdv1 = LISAModel((10.0e-12) ** 2, (2.4e-15) ** 2, DefaultOrbits(), "mrdv1")
-sangria = LISAModel((10.0e-12) ** 2, (2.4e-15) ** 2, DefaultOrbits(), "sangria")
+sangria = LISAModel((7.9e-12) ** 2, (2.4e-15) ** 2, DefaultOrbits(), "sangria")
 
 __stock_list_models__ = [scirdv1, proposal, mrdv1, sangria]
 __stock_list_models_name__ = [tmp.name for tmp in __stock_list_models__]

lisatools/sensitivity.py

@@ -117,7 +117,6 @@ class Sensitivity(ABC):
             PSD values.
 
         """
-        x = 2.0 * np.pi * lisaLT * f
 
         # get noise values
         Spm, Sop = cls.lisanoises(f, model)
@@ -126,7 +125,11 @@ class Sensitivity(ABC):
         Sout = cls.transform(f, Spm, Sop, **kwargs)
 
         # will add zero if ignored
-        Sout += cls.get_stochastic_contribution(f, **kwargs)
+        stochastic_contribution = cls.stochastic_transform(
+            f, cls.get_stochastic_contribution(f, **kwargs), **kwargs
+        )
+
+        Sout += stochastic_contribution
         return Sout
 
     @classmethod
@@ -173,12 +176,9 @@ class Sensitivity(ABC):
             if stochastic_function is None:
                 stochastic_function = FittedHyperbolicTangentGalacticForeground
 
-            try:
                 check = stochastic_function.get_Sh(
                     f, *stochastic_params, **stochastic_kwargs
                 )
-            except:
-                breakpoint()
             sgal[:] = check
 
         if squeeze:
@@ -343,7 +343,7 @@ class A1TDISens(Sensitivity):
         )
 
         x = 2.0 * np.pi * lisaLT * f
-        return (
+        Sa = (
             8.0
             * np.sin(x) ** 2
             * (
@@ -352,6 +352,8 @@ class A1TDISens(Sensitivity):
             )
         )
 
+        return Sa
+
     @staticmethod
     def stochastic_transform(
         f: float | np.ndarray, Sh: float | np.ndarray, **kwargs: dict

lisatools/glitch.py

@@ -1,193 +0,0 @@
-from lisaconstants import *
-import numpy as np
-
-co = C_SI
-
-
-def HeavisideTheta(x, xp=None):
-    if xp is None:
-        xp = np
-
-    squeeze = True if x.ndim == 1 else False
-
-    x = xp.atleast_1d(x)
-
-    out = 1.0 * (x >= 0.0)
-
-    if squeeze:
-        out = out.squeeze()
-
-    return out
-
-
-def DiracDelta(x, xp=None):
-    if xp is None:
-        xp = np
-    squeeze = True if x.ndim == 1 else False
-
-    x = xp.atleast_1d(x)
-
-    # 1e-10 to guard against numerical error
-    out = 1.0 * (xp.abs(x) < 1e-10)
-
-    if squeeze:
-        out = out.squeeze()
-
-    return out
-
-
-tau_2_default = 5585.708541201614
-Deltav_default = 1.1079114425597559 * 10 ** (-9)
-
-tau_2_default = 1.9394221536001746
-Deltav_default = 2.22616837 * 10 ** (-11)
-t0 = 600
-
-
-def tdi_glitch_XYZ1(
-    t_in, T=8.3, tau_2=tau_2_default, Deltav=Deltav_default, t0=600, mtm=1.982, xp=None
-):
-    # def tdi_glitch_XYZ1(t_in, T=8.3, tau_1=480.0, tau_2=100.0, Deltav=1e-12, t0=600.0, mtm=1.982, xp=None):
-
-    if xp is None:
-        xp = np
-
-    tau_2 = xp.atleast_1d(tau_2)
-    t0 = xp.atleast_1d(t0)
-    Deltav = xp.atleast_1d(Deltav)
-
-    assert tau_2.shape == t0.shape == Deltav.shape
-
-    out = xp.zeros((3, len(t0), len(t_in)))
-
-    run = ~(
-        xp.isinf(xp.exp((-t_in[None, :] + t0[:, None])))
-        | xp.isnan(xp.exp((-t_in[None, :] + t0[:, None])))
-    )
-
-    tdiX1link12 = (
-        mtm
-        * Deltav[:, None]
-        * (
-            t_in[None, :]
-            - t0[:, None]
-            - 2 * tau_2[:, None]
-            + xp.exp((-t_in[None, :] + t0[:, None]) / tau_2[:, None])
-            * (t_in[None, :] - t0[:, None] + 2 * tau_2[:, None])
-        )
-        * DiracDelta(t_in[None, :] - t0[:, None])
-        + mtm
-        * Deltav[:, None]
-        * (
-            1
-            + (
-                xp.exp((-t_in[None, :] + t0[:, None]) / tau_2[:, None])
-                * (-t_in[None, :] + t0[:, None] - tau_2[:, None])
-            )
-            / tau_2[:, None]
-        )
-        * HeavisideTheta(t_in[None, :] - t0[:, None])
-    ) / co - (
-        mtm
-        * Deltav[:, None]
-        * (
-            t_in[None, :]
-            + 4 * T
-            - t0[:, None]
-            - 2 * tau_2[:, None]
-            + xp.exp((-t_in[None, :] - 4 * T + t0[:, None]) / tau_2[:, None])
-            * (t_in[None, :] + 4 * T - t0[:, None] + 2 * tau_2[:, None])
-        )
-        * DiracDelta(t_in[None, :] + 4 * T - t0[:, None])
-        + mtm
-        * Deltav[:, None]
-        * (
-            1
-            - (
-                xp.exp((-t_in[None, :] - 4 * T + t0[:, None]) / tau_2[:, None])
-                * (t_in[None, :] + 4 * T - t0[:, None] + tau_2[:, None])
-            )
-            / tau_2[:, None]
-        )
-        * HeavisideTheta(t_in[None, :] + 4 * T - t0[:, None])
-    ) / co
-
-    tdiY1link12 = (
-        -2
-        * (
-            mtm
-            * Deltav[:, None]
-            * (
-                t_in[None, :]
-                + T
-                - t0[:, None]
-                - 2 * tau_2[:, None]
-                + (t_in[None, :] + T - t0[:, None] + 2 * tau_2[:, None])
-                / xp.exp((t_in[None, :] + T - t0[:, None]) / tau_2[:, None])
-            )
-            * DiracDelta(t_in[None, :] + T - t0[:, None])
-            + mtm
-            * Deltav[:, None]
-            * (
-                1
-                - (t_in[None, :] + T - t0[:, None] + tau_2[:, None])
-                / (
-                    xp.exp((t_in[None, :] + T - t0[:, None]) / tau_2[:, None])
-                    * tau_2[:, None]
-                )
-            )
-            * HeavisideTheta(t_in[None, :] + T - t0[:, None])
-        )
-    ) / co + (
-        2
-        * (
-            mtm
-            * Deltav[:, None]
-            * (
-                t_in[None, :]
-                + 3 * T
-                - t0[:, None]
-                - 2 * tau_2[:, None]
-                + xp.exp((-t_in[None, :] - 3 * T + t0[:, None]) / tau_2[:, None])
-                * (t_in[None, :] + 3 * T - t0[:, None] + 2 * tau_2[:, None])
-            )
-            * DiracDelta(t_in[None, :] + 3 * T - t0[:, None])
-            + mtm
-            * Deltav[:, None]
-            * (
-                1
-                - (
-                    xp.exp((-t_in[None, :] - 3 * T + t0[:, None]) / tau_2[:, None])
-                    * (t_in[None, :] + 3 * T - t0[:, None] + tau_2[:, None])
-                )
-                / tau_2[:, None]
-            )
-            * HeavisideTheta(t_in[None, :] + 3 * T - t0[:, None])
-        )
-    ) / co
-
-    tdiZ1link12 = xp.zeros_like(tdiX1link12)
-
-    tdiX1link12[~run] = 0.0
-    tdiY1link12[~run] = 0.0
-    tdiZ1link12[~run] = 0.0
-
-    out[0, run] = tdiX1link12[run]
-    out[1, run] = tdiY1link12[run]
-    out[2, run] = tdiZ1link12[run]
-
-    return out
-
-
-if __name__ == "__main__":
-    dt = 1 / 0.3
-    t = np.arange(2e3) * dt
-    check = tdi_glitch_XYZ1(
-        t
-    )  # , T=8.3, tau_1=480.0, tau_2=100.0, Deltav=1e-12, t0=600.0, mtm=1.982)
-    import matplotlib.pyplot as plt
-
-    plt.loglog(np.fft.rfftfreq(len(check[0]), dt), np.abs(np.fft.rfft(check[0])))
-    plt.loglog(np.fft.rfftfreq(len(check[0]), dt), np.abs(np.fft.rfft(check[1])))
-    plt.savefig("plot1.png")
-    breakpoint()

lisatools/sampling/moves/gbgroupstretch.py

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import numpy as np
-from scipy import stats
-import warnings
-
-try:
-    import cupy as xp
-
-    gpu_available = True
-except ModuleNotFoundError:
-    import numpy as xp
-
-    gpu_available = False
-
-from eryn.moves import GroupStretchMove
-from eryn.prior import ProbDistContainer
-from eryn.utils.utility import groups_from_inds
-from .gbmultipletryrj import GBMutlipleTryRJ
-
-from ...diagnostic import inner_product
-
-
-__all__ = ["GBGroupStretchMove"]
-
-
-# MHMove needs to be to the left here to overwrite GBBruteRejectionRJ RJ proposal method
-class GBGroupStretchMove(GroupStretchMove, GBMutlipleTryRJ):
-    """Generate Revesible-Jump proposals for GBs with try-force rejection
-
-    Will use gpu if template generator uses GPU.
-
-    Args:
-        priors (object): :class:`ProbDistContainer` object that has ``logpdf``
-            and ``rvs`` methods.
-
-    """
-
-    def __init__(
-        self,
-        gb_args,
-        gb_kwargs,
-        start_ind_limit=10,
-        *args,
-        **kwargs
-    ):
-
-        self.name = "gbgroupstretch"
-        self.start_ind_limit = start_ind_limit
-        GBMutlipleTryRJ.__init__(self, *gb_args, **gb_kwargs)
-        GroupStretchMove.__init__(self, *args, **kwargs)
-
-