lisaanalysistools 1.0.4__tar.gz → 1.0.5__tar.gz

{lisaanalysistools-1.0.4 → lisaanalysistools-1.0.5/LISAanalysistools.egg-info}/PKG-INFO

@@ -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 → lisaanalysistools-1.0.5}/LISAanalysistools.egg-info/SOURCES.txt

@@ -4,11 +4,6 @@ MANIFEST.in
 Makefile
 README.md
 pyproject.toml
-requirements-data.txt
-requirements-demo.txt
-requirements-dev.txt
-requirements-release.txt
-requirements.txt
 setup.py
 LISAanalysistools.egg-info/PKG-INFO
 LISAanalysistools.egg-info/SOURCES.txt
@@ -26,7 +21,6 @@ lisatools/analysiscontainer.py
 lisatools/datacontainer.py
 lisatools/detector.py
 lisatools/diagnostic.py
-lisatools/glitch.py
 lisatools/sensitivity.py
 lisatools/stochastic.py
 lisatools/sampling/__init__.py
@@ -35,20 +29,12 @@ lisatools/sampling/prior.py
 lisatools/sampling/stopping.py
 lisatools/sampling/utility.py
 lisatools/sampling/moves/__init__.py
-lisatools/sampling/moves/gbgroupstretch.py
-lisatools/sampling/moves/gbmultipletryrj.py
-lisatools/sampling/moves/gbspecialgroupstretch.py
-lisatools/sampling/moves/gbspecialstretch.py
-lisatools/sampling/moves/mbhspecialmove.py
-lisatools/sampling/moves/placeholder.py
 lisatools/sampling/moves/skymodehop.py
-lisatools/sampling/moves/specialforegroundmove.py
 lisatools/sources/__init__.py
 lisatools/sources/emri/__init__.py
 lisatools/sources/emri/tdiwaveform.py
 lisatools/utils/__init__.py
 lisatools/utils/constants.py
-lisatools/utils/multigpudataholder.py
 lisatools/utils/pointeradjust.py
 lisatools/utils/utility.py
 scripts/data_download.py

{lisaanalysistools-1.0.4/LISAanalysistools.egg-info → lisaanalysistools-1.0.5}/PKG-INFO

@@ -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 → lisaanalysistools-1.0.5}/README.md

@@ -43,7 +43,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 → lisaanalysistools-1.0.5}/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"

{lisaanalysistools-1.0.4 → lisaanalysistools-1.0.5}/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__]

{lisaanalysistools-1.0.4 → lisaanalysistools-1.0.5}/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

{lisaanalysistools-1.0.4 → lisaanalysistools-1.0.5}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = 'setuptools.build_meta'
 
 [tool.poetry]
 name = "lisaanalysistools"
-version = "1.0.4"
+version = "1.0.5"
 description = "A package for LISA Data Analysis"
 license = "Apache"
 classifiers = ["Programming Language :: Python :: 3", "Operating System :: OS Independent"]