lisaanalysistools 1.0.14__cp312-cp312-macosx_11_0_arm64.whl → 1.0.15__cp312-cp312-macosx_11_0_arm64.whl

{lisaanalysistools-1.0.14.dist-info → lisaanalysistools-1.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: lisaanalysistools
-Version: 1.0.14
+Version: 1.0.15
 Home-page: https://github.com/mikekatz04/LISAanalysistools
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -20,6 +20,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-python
 
 # LISA Analysis Tools
@@ -73,7 +74,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.14
+Current Version: 1.0.15
 
 ## Authors/Developers
 

{lisaanalysistools-1.0.14.dist-info → lisaanalysistools-1.0.15.dist-info}/RECORD

@@ -1,5 +1,6 @@
+lisaanalysistools-1.0.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 lisatools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/_version.py,sha256=X_5dzU8oUd8U7KoQTq2kCDFvUTGALcafGT6csSjAwfo,124
+lisatools/_version.py,sha256=-xKWnUCFbpmvy1CV7RLNU19hmg0-CO3bLijwTloAg4E,124
 lisatools/analysiscontainer.py,sha256=UQft6SvyDueDtuL1H1auiEzG5IEsFwRiiXf_0DHtu5U,16289
 lisatools/datacontainer.py,sha256=ChMXkaVCzxe9n90slN4Ncsh8Sd3lGx9PX5hyNCYXG0E,10069
 lisatools/detector.py,sha256=1ATZToFoy14U3ACTyver2x9DKavJ3l6ToU6nUSGSTmo,21161
@@ -7,7 +8,7 @@ lisatools/diagnostic.py,sha256=rm--mBNIEylT2qdJD-b60yfOrzNBTYT1Aki6Ee7KVQ4,34501
 lisatools/sensitivity.py,sha256=gn8AMbel2BGg3ELptCSM9b2MmSf_gX39QVQ-TK5d8TY,29658
 lisatools/stochastic.py,sha256=YHtM9Ll02wyqezCJO53L34x3mt_-qs9n9abdXcEap8o,10518
 lisatools/cutils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lisatools/cutils/detector_cpu.cpython-312-darwin.so,sha256=u44nnWGARukQ_rMbQv4YPosZky_rny-SjUtGzlBpvNU,167760
+lisatools/cutils/detector_cpu.cpython-312-darwin.so,sha256=bh3BUtJ2FjTVwp93WEhTBprFEbjn4qYn1QkKh4dW0u0,197136
 lisatools/cutils/include/Detector.hpp,sha256=Ic37OgP-gvEg8qouhv9aFYf7vQP98tJ_i6PGu8RI1YQ,2050
 lisatools/cutils/include/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/cutils/include/global.hpp,sha256=3VPiqglTMRrIBXlEvDUJO2-CjKy_SLUXZt-9A1fH6lQ,572
@@ -24,20 +25,19 @@ lisatools/sampling/moves/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 lisatools/sampling/moves/skymodehop.py,sha256=0nf72eFhFMGwi0dLJci6XZz-bIMGqco2B2_J72hQvf8,3348
 lisatools/sources/__init__.py,sha256=Fm085xHQ3VpRjqaSlws0bdVefFofAxNzVZyGQQYrQic,140
 lisatools/sources/defaultresponse.py,sha256=2SMbRf-UwgLNaA89tIANjw4BCKh1XEuRg5mgkvAg3-k,839
-lisatools/sources/utils.py,sha256=5blfG4ozaN1QgOZR49o1vDH6E9_x0g1dNGfsRiTrVeo,14342
+lisatools/sources/utils.py,sha256=V07Zq_pewa2UBwqD3JAub0bdBaejatGc9nAgu01idbM,14408
 lisatools/sources/waveformbase.py,sha256=JPLqLZd1e-6E3ySyXodO83nZGH8bVq2K_s8sF2Oy84w,845
 lisatools/sources/bbh/__init__.py,sha256=M3yP4eaScZZMhOucn88iiJ2WGL6zZTQI0xUEnmw4Nu8,37
 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/emri/waveform.py,sha256=M6NFZ2s00SVGL1CuyColcZw2UmE0qraGNh1dKCzN0sA,2424
 lisatools/sources/gb/__init__.py,sha256=GDlLi4M4QPoEdvScIyOyhTuqk0XvFM5ymhR1EE7FYXY,36
 lisatools/sources/gb/waveform.py,sha256=Plwym5CHCEZIDiQ4Fc7MrTh7T74hMNkqGqy2YDpd_OE,1777
 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.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-lisaanalysistools-1.0.14.dist-info/METADATA,sha256=lC0Zz52X9MZBF0LtIJ1tVtP-Jp6kL9mAPXQOjwdqMnQ,4359
-lisaanalysistools-1.0.14.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
-lisaanalysistools-1.0.14.dist-info/top_level.txt,sha256=qXUn8Xi8yvK0vr3QH0vvT5cmoccjSj-UPeKGLAxdYGo,10
-lisaanalysistools-1.0.14.dist-info/RECORD,,
+lisaanalysistools-1.0.15.dist-info/METADATA,sha256=M2FPkqr04YnYYOvAhiaCHqh7qWlrjBtBE_Z-uV1G1Wc,4381
+lisaanalysistools-1.0.15.dist-info/WHEEL,sha256=CltXN3lQvXbHxKDtiDwW0RNzF8s2WyBuPbOAX_ZeQlA,109
+lisaanalysistools-1.0.15.dist-info/top_level.txt,sha256=qXUn8Xi8yvK0vr3QH0vvT5cmoccjSj-UPeKGLAxdYGo,10
+lisaanalysistools-1.0.15.dist-info/RECORD,,

{lisaanalysistools-1.0.14.dist-info → lisaanalysistools-1.0.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_11_0_arm64
 

lisatools/_version.py

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

lisatools/sources/emri/waveform.py

@@ -21,7 +21,7 @@ default_response_kwargs = dict(
 
 
 class EMRITDIWaveform(AETTDIWaveform):
-    """Generate EMRI waveforms with the TDI LISA Response
+    """Generate EMRI waveforms with the TDI LISA Response.
 
     Args:
         T: Observation time in years.
@@ -36,7 +36,7 @@ class EMRITDIWaveform(AETTDIWaveform):
         self,
         T: Optional[float] = 1.0,
         dt: Optional[float] = 10.0,
-        emri_waveform_args: Optional[tuple] = ("FastSchwarzschildEccentricFlux",),
+        emri_waveform_args: Optional[tuple] = ("FastKerrEccentricEquatorialFlux",),
         emri_waveform_kwargs: Optional[dict] = {},
         response_kwargs: Optional[dict] = default_response_kwargs,
     ):

lisatools/sources/utils.py

@@ -255,9 +255,9 @@ class GBCalculationController(CalculationController):
 
         # parameter transforms from sampling basis to waveform basis
         parameter_transforms = {
-            0: np.exp,
+            0: lambda x: x * 1e-23,
             1: lambda x: x / 1e3,
-            2: np.exp,
+            2: lambda x: x * 1e-18,
             5: np.arccos,
             8: np.arcsin,
             # (1, 2, 3): lambda x, y, z: (x, y, 11.0 / 3.0 * y**2 / x),
@@ -302,9 +302,10 @@ class GBCalculationController(CalculationController):
 
         params = np.asarray(params)
 
-        params[0] = np.log(params[0])
+        # params[0] = np.log(params[0])
+        params[0] = params[0] / 1e-23
         params[1] = params[1] * 1e3
-        params[2] = np.log(params[2])
+        params[2] = params[2] / 1e-18
 
         if params[3] != 0.0:
             raise NotImplementedError(