lisaanalysistools 1.0.12__cp312-cp312-macosx_10_9_x86_64.whl → 1.0.13__cp312-cp312-macosx_10_9_x86_64.whl

{lisaanalysistools-1.0.12.dist-info → lisaanalysistools-1.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lisaanalysistools
-Version: 1.0.12
+Version: 1.0.13
 Home-page: https://github.com/mikekatz04/LISAanalysistools
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -66,7 +66,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/mikekatz04/LISAanalysistools/tags).
 
-Current Version: 1.0.12
+Current Version: 1.0.13
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.12.dist-info → lisaanalysistools-1.0.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lisatools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/_version.py,sha256=1Lp_ETV00qR2o-39OIKWoOpdUW6gApuQthdWT5LgYeg,124
+lisatools/_version.py,sha256=XRl2hGMUBZ0ckRA_03jI5CQSKqwDjNsjtDrHMGr_g9U,124
 lisatools/analysiscontainer.py,sha256=UQft6SvyDueDtuL1H1auiEzG5IEsFwRiiXf_0DHtu5U,16289
 lisatools/datacontainer.py,sha256=oCvSbGFYWKUpAPfCHdXut-5-VEzoBs560ZtxFSUOPes,9927
 lisatools/detector.py,sha256=1ATZToFoy14U3ACTyver2x9DKavJ3l6ToU6nUSGSTmo,21161
@@ -27,7 +27,7 @@ lisatools/sources/defaultresponse.py,sha256=2SMbRf-UwgLNaA89tIANjw4BCKh1XEuRg5mg
 lisatools/sources/utils.py,sha256=5blfG4ozaN1QgOZR49o1vDH6E9_x0g1dNGfsRiTrVeo,14342
 lisatools/sources/waveformbase.py,sha256=JPLqLZd1e-6E3ySyXodO83nZGH8bVq2K_s8sF2Oy84w,845
 lisatools/sources/bbh/__init__.py,sha256=M3yP4eaScZZMhOucn88iiJ2WGL6zZTQI0xUEnmw4Nu8,37
-lisatools/sources/bbh/waveform.py,sha256=-xg2uYB8AWf233W34hxwLsnlSYPF9d7TqzNfXj95zaA,2599
+lisatools/sources/bbh/waveform.py,sha256=BDLv_9_8OnTbS-jRoSyPddTD7Ca7C1_9byLPU-W_CuU,3197
 lisatools/sources/emri/__init__.py,sha256=3W0kL4bfTtZNm-wM5t6Y0TTjtZMh4fe_qDyZ6a5rLck,38
 lisatools/sources/emri/waveform.py,sha256=W7Dx_ibygF8zbz1neJzyddy7HGH0kDppDI3HKStdbqc,2422
 lisatools/sources/gb/__init__.py,sha256=GDlLi4M4QPoEdvScIyOyhTuqk0XvFM5ymhR1EE7FYXY,36
@@ -36,8 +36,8 @@ lisatools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/utils/constants.py,sha256=r1kVwkpbZS13JTOxj2iRxT5sMgTYX30y-S0JdVmD5Oo,1354
 lisatools/utils/pointeradjust.py,sha256=2sT-7qeYWr1pd_sHk9leVHUTSJ7jJgYIRoWQOtYqguE,2995
 lisatools/utils/utility.py,sha256=MKqRsG8qRI1xCsj51mt6QRa80-deUUgedxibyMV3KD4,6776
-lisaanalysistools-1.0.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lisaanalysistools-1.0.12.dist-info/METADATA,sha256=2u6VUXb26VH1LhWt8i3LBbZVEQsiezeCV9MSWSia8Xw,4202
-lisaanalysistools-1.0.12.dist-info/WHEEL,sha256=zL8OKpwMaCM_hEdCwF-bHbg5JyuZtrW4vMYNMNxkj9k,110
-lisaanalysistools-1.0.12.dist-info/top_level.txt,sha256=qXUn8Xi8yvK0vr3QH0vvT5cmoccjSj-UPeKGLAxdYGo,10
-lisaanalysistools-1.0.12.dist-info/RECORD,,
+lisaanalysistools-1.0.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+lisaanalysistools-1.0.13.dist-info/METADATA,sha256=UyWSKEdohLEvNlvf5Qyj_rxAp2U8Gi1Oz1NrQ0GY2NE,4202
+lisaanalysistools-1.0.13.dist-info/WHEEL,sha256=zL8OKpwMaCM_hEdCwF-bHbg5JyuZtrW4vMYNMNxkj9k,110
+lisaanalysistools-1.0.13.dist-info/top_level.txt,sha256=qXUn8Xi8yvK0vr3QH0vvT5cmoccjSj-UPeKGLAxdYGo,10
+lisaanalysistools-1.0.13.dist-info/RECORD,,

lisatools/_version.py

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

lisatools/sources/bbh/waveform.py

@@ -50,7 +50,13 @@ class BBHSNRWaveform(SNRWaveform):
         self._f_arr = f_arr
 
     def __call__(
-        self, *params: Any, return_array: Optional[bool] = False, **kwargs: Any
+        self,
+        *params: Any,
+        return_array: Optional[bool] = False,
+        mf_min: Optional[float] = 1e-4,
+        mf_max: Optional[float] = 0.6,
+        freqs: Optional[np.ndarray] = None,
+        **kwargs: Any
     ) -> Tuple[np.ndarray, np.ndarray, np.ndarray] | np.ndarray:
         """Generate waveforms for SNR calculations.
 
@@ -59,6 +65,10 @@ class BBHSNRWaveform(SNRWaveform):
                 for :class:`BBHWaveformFD`.
             return_array: If ``True``, return ``array([A, E, T]).
                 If ``False``, return (A, E, T).
+            mf_min: Minimum dimensionless frequency to evaluate.
+            mf_max: Maximum dimensionless frequency to evaluate.
+            freqs: If ``None``, then default will be ``np.logspace(mf_min / M, mf_max / M, 1024)``.
+                Otherwise, it will calulate frequencies based on this exact array.
             **kwargs: ``kwargs`` for the ``__call__`` function
                 for :class:`BBHWaveformFD`.
 
@@ -71,9 +81,14 @@ class BBHSNRWaveform(SNRWaveform):
         m1 = params[0]
         m2 = params[1]
 
-        min_f = 1e-4 / (MTSUN_SI * (m1 + m2))
-        max_f = 0.6 / (MTSUN_SI * (m1 + m2))
-        self.f_arr = np.logspace(np.log10(min_f), np.log10(max_f), 1024)
+        if freqs is None:
+            min_f = mf_min / (MTSUN_SI * (m1 + m2))
+            max_f = mf_max / (MTSUN_SI * (m1 + m2))
+            self.f_arr = np.logspace(np.log10(min_f), np.log10(max_f), 1024)
+
+        else:
+            assert isinstance(freqs, np.ndarray)
+            self.f_arr = freqs
 
         # generate waveform with proper settings
         AET = self.wave_gen(