sxs 2023.2.0__py3-none-any.whl → 2023.3.1__py3-none-any.whl

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2023.2.0"
+__version__ = "2023.3.1"

sxs/julia/GWFrames.py

@@ -1,3 +1,4 @@
+import numpy as np
 import quaternionic
 from .. import WaveformModes
 from . import PostNewtonian
@@ -46,17 +47,25 @@ def PNWaveform(
         **kwargs
     )
 
+    coorbital_frame = quaternionic.array(w1.frame.to_numpy())
+    frame = np.array([quaternionic.one]) if inertial else coorbital_frame
+    frame_type = "inertial" if inertial else "coorbital"
+
     w = WaveformModes(
-        w1.data,
-        time=w1.t,
+        w1.data.to_numpy(),
+        time=w1.t.to_numpy(),
         modes_axis=1,
-        ell_min=2,
-        ell_max=8,
+        ell_min=ell_min,
+        ell_max=ell_max,
+        spin_weight=-2,
+        frame=frame,
+        frame_type=frame_type,
+        data_type="h",
         M1=w1.M1.to_numpy(),
         M2=w1.M2.to_numpy(),
         chi1=w1.chi1.to_numpy(),
         chi2=w1.chi2.to_numpy(),
-        frame=quaternionic.array(w1.frame.to_numpy()),
+        coorbital_frame=coorbital_frame,
         v=w1.v.to_numpy(),
         orbital_phase=w1.Phi.to_numpy(),
     )
@@ -66,7 +75,7 @@ def PNWaveform(
     w.M2 = w._metadata["M2"]
     w.chi1 = w._metadata["chi1"]
     w.chi2 = w._metadata["chi2"]
-    #w.frame = w._metadata["frame"]  ## Already done
+    w.coorbital_frame = w._metadata["coorbital_frame"]
     w.v = w._metadata["v"]
     w.orbital_phase = w._metadata["orbital_phase"]
 

sxs/julia/__init__.py

@@ -1,3 +1,4 @@
+import numpy as np
 import quaternionic
 from .. import WaveformModes
 
@@ -6,7 +7,8 @@ import juliacall
 
 PostNewtonian = juliacall.newmodule("PN")
 PostNewtonian.seval("using PostNewtonian")
-GWFrames = PostNewtonian.GWFrames
+
+from . import GWFrames
 
 def pkg_update():
     """Update all installed Julia packages (but not julia itself)."""
@@ -16,6 +18,7 @@ def pkg_update():
 
 def PNWaveform(
         M1, M2, chi1, chi2, Omega_i, *,
+        inertial=True,
         ell_min=2, ell_max=8, waveform_pn_order=None,
         **orbital_evolution_kwargs
 ):
@@ -33,7 +36,7 @@ def PNWaveform(
         - `v` (array): The orbital velocity as a function of time.
         - `orbital_phase` (array): The orbital phase as a function of
           time.
-    
+
     This is a wrapper around the Julia functions
     `PostNewtonian.orbital_evolution` and
     `PostNewtonian.inertial_waveform`.  See [the Julia
@@ -45,7 +48,7 @@ def PNWaveform(
     docs](https://moble.github.io/PostNewtonian.jl/dev/interface/python/)
     for details.  Also, the GWFrames submodule of this module provides
     another interface.
-    
+
     """
     # Integrate the orbital dynamics
     inspiral = PostNewtonian.orbital_evolution(
@@ -55,9 +58,19 @@ def PNWaveform(
 
     # Compute the waveform in the inertial frame
     waveform_pn_order = waveform_pn_order or PostNewtonian.typemax(PostNewtonian.Int)
-    h = PostNewtonian.inertial_waveform(
-        inspiral, ell_min=ell_min, ell_max=ell_max, PNOrder=waveform_pn_order
-    ).to_numpy().T
+    coorbital_frame = quaternionic.array(values[8:12, :].to_numpy().T)
+    if inertial:
+        frame = np.array([quaternionic.one])
+        frame_type = "inertial"
+        h = PostNewtonian.inertial_waveform(
+            inspiral, ell_min=ell_min, ell_max=ell_max, PNOrder=waveform_pn_order
+        ).to_numpy().T
+    else:
+        frame = coorbital_frame
+        frame_type = "coorbital"
+        h = PostNewtonian.coorbital_waveform(
+            inspiral, ell_min=ell_min, ell_max=ell_max, PNOrder=waveform_pn_order
+        ).to_numpy().T
 
     w = WaveformModes(
         h,
@@ -65,11 +78,15 @@ def PNWaveform(
         modes_axis=1,
         ell_min=ell_min,
         ell_max=ell_max,
+        spin_weight=-2,
+        frame=frame,
+        frame_type=frame_type,
+        data_type="h",
         M1=values[0, :].to_numpy(),
         M2=values[1, :].to_numpy(),
         chi1=values[2:5, :].to_numpy().T,
         chi2=values[5:8, :].to_numpy().T,
-        frame=quaternionic.array(values[8:12, :].to_numpy().T),
+        coorbital_frame=coorbital_frame,
         v=values[12, :].to_numpy(),
         orbital_phase=values[13, :].to_numpy(),
     )
@@ -79,7 +96,7 @@ def PNWaveform(
     w.M2 = w._metadata["M2"]
     w.chi1 = w._metadata["chi1"]
     w.chi2 = w._metadata["chi2"]
-    #w.frame = w._metadata["frame"]  ## Already done
+    w.coorbital_frame = w._metadata["coorbital_frame"]
     w.v = w._metadata["v"]
     w.orbital_phase = w._metadata["orbital_phase"]
 

sxs/juliapkg.json

@@ -3,7 +3,7 @@
     "packages": {
         "PostNewtonian": {
             "uuid": "377afc40-5642-4616-8613-b7ebca523866",
-            "version": "0.8.0"
+            "version": "0.9"
         }
     }
 }

sxs/waveforms/waveform_modes.py

@@ -876,7 +876,7 @@ class WaveformModes(WaveformMixin, TimeSeries):
         ll = self.expectation_value_LL
 
         # Solve ⟨w|LᵇLᵃ|w⟩ ωₐ = -⟨w|Lᵇ∂ₜ|w⟩ for ω
-        ω = -np.linalg.solve(ll, ldt)
+        ω = -np.linalg.solve(ll, ldt[..., np.newaxis])[..., 0]
 
         return ω
 

{sxs-2023.2.0.dist-info → sxs-2023.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sxs
-Version: 2023.2.0
+Version: 2023.3.1
 Summary: Interface to data produced by the Simulating eXtreme Spacetimes collaboration
 Project-URL: Homepage, https://github.com/sxs-collaboration/sxs
 Project-URL: Documentation, https://sxs.readthedocs.io/

{sxs-2023.2.0.dist-info → sxs-2023.3.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 sxs/__init__.py,sha256=mDh2J6wLpie1GJT-Z3cmB3poEOvjXk-JsRu-p9U7zlI,2512
-sxs/__version__.py,sha256=8J0K7gy6dHxZ0PVCGSAx00hLycCaLjH0epD4_pqqTK8,25
+sxs/__version__.py,sha256=ZUB4Y9Iv9pGtodvEnODNEQt5ZD0hbfm5urGs3QoD-iQ,25
 sxs/handlers.py,sha256=odBzrk5f-Q3Nzm2_brKBGiSgo-x8q4DmCt0H0E6J8Ko,20929
-sxs/juliapkg.json,sha256=u7kSSlR0fsObNs92WA4aNkl6sg-B9FagLK_jKmZCons,176
+sxs/juliapkg.json,sha256=cD8OYJOG-cyVvmrnvoiJOl_cxSUAOYqOnEMmg_AESj0,174
 sxs/time_series.py,sha256=c3doMFyRrC33_YjFO4CLGhBOECWECo4TGzrhetSG8EQ,39641
 sxs/caltechdata/__init__.py,sha256=s-RXyBiImKsQenqJIU6NAjlsjOX7f1MkIIW9rPtWYyg,14761
 sxs/caltechdata/catalog.py,sha256=E2nystCaMZLKxTlLgfbfpGkckfkLyIzhn3YeEI3nQYc,4914
@@ -13,8 +13,8 @@ sxs/catalog/description.py,sha256=4eHMde4oGNp69jRmXCsfrIYJ4WK5HYgYFgXyF5htLDM,10
 sxs/horizons/__init__.py,sha256=KR0aaEyreLHJItMBExGhG8bhRrHfPc0jBgPMsHysoEY,16265
 sxs/horizons/spec_horizons_h5.py,sha256=63cIGXuCEbJWrkRu3_mjL2gmssWtQ4axBTmg_wo_020,3642
 sxs/horizons/xor_multishuffle_bzip2.py,sha256=y4AKuxmLuj8K1pkdhIoSzENGyMu4uhpiPrBh-XisvK4,6536
-sxs/julia/GWFrames.py,sha256=WIm6TKm_2crM4TDY098XOKZVccUDzN8ndDN5RrG9eHI,2558
-sxs/julia/__init__.py,sha256=jJ5nyg0z5ao92TuSLM9cQPgy0pddzZLf-jJ-ZI5ei0I,2985
+sxs/julia/GWFrames.py,sha256=47H9Ugff7ldGBujiUTcADT3b4MSxUtqmajvSApI91WA,2892
+sxs/julia/__init__.py,sha256=uSLP_xfU-GZG7IO5vs0TEkCR4LH8aBYMF-852wDY3kI,3490
 sxs/metadata/__init__.py,sha256=KCvJ9Cf1WhIZp-z28UzarKcmUAzV2BOv2gqKiorILjo,149
 sxs/metadata/metadata.py,sha256=_vGqMUbeiN0fecJj9f9f9ex56WgSZuwwBXykUuj1_ZI,27679
 sxs/utilities/__init__.py,sha256=Np27-TQRWfGP8HtDWlZcnZ_UL8QHBXLjXHGHGAbHD2g,4580
@@ -58,7 +58,7 @@ sxs/waveforms/mode_utilities.py,sha256=gxsW-hunCoIReBVv9IrkGLdshr0rmztbH-JRgD6D9
 sxs/waveforms/transformations.py,sha256=S5C-xnCk2umZlVsYgciyp7VMGZA8NI6md7OZp72upJU,9124
 sxs/waveforms/waveform_grid.py,sha256=aBlcsudj1XozZD7n42sh6-nzysKNalAdHJkVQ7M6fE4,180
 sxs/waveforms/waveform_mixin.py,sha256=S0RNe2HkwnqdCyGEarGYmoXD_DkTWGorsiGGIBWOam8,1179
-sxs/waveforms/waveform_modes.py,sha256=dA9nmWoGEq7dHFJbpMu_VAHtizptyQqwalKAe7ZRKwU,56594
+sxs/waveforms/waveform_modes.py,sha256=OPv6UXIlWhLswm1r36K_zltF20vYh3G6EjrPGAHtWUQ,56619
 sxs/waveforms/waveform_signal.py,sha256=Ojrt6DSDdleB0qmu6UwjjPnYdaWsrjnpBA_8dhnM_q4,182
 sxs/waveforms/format_handlers/__init__.py,sha256=0wsnuBYCYsCkN19L2ipga7BtigvPyBcqiy_4qrzmLpE,50
 sxs/waveforms/format_handlers/lvc.py,sha256=kUiLT-QbBTH5Di2touWwXqasQ8Q777mV9zhRIHEqjPk,7789
@@ -75,7 +75,7 @@ sxs/zenodo/api/__init__.py,sha256=EM_eh4Q8R5E0vIfMhyIR1IYFfOBu6vA0UTasgX9gHys,21
 sxs/zenodo/api/deposit.py,sha256=uor1irig-gBvrEQNg_Wb0ZuiXhZC9AeLwuJu3vB30e0,36946
 sxs/zenodo/api/login.py,sha256=Yz0ytgi81_5BpDzhrS0WPMXlvU2qUaCK8yn8zxfEbko,18007
 sxs/zenodo/api/records.py,sha256=nKkhoHZ95CTztHF9Zzaug5p7IiUCJG4Em1i-l-WqH6U,3689
-sxs-2023.2.0.dist-info/METADATA,sha256=Quttf97Q_Z9dfCqUGXHk9XepZHVrv3vkJKiwKNsWtVg,9419
-sxs-2023.2.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-sxs-2023.2.0.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2023.2.0.dist-info/RECORD,,
+sxs-2023.3.1.dist-info/METADATA,sha256=jdWMjW8wIOoHyW9fNhKVUhuYAaMheCcx1QJVauaOtUs,9419
+sxs-2023.3.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+sxs-2023.3.1.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2023.3.1.dist-info/RECORD,,