sxs 2024.0.23__tar.gz → 2024.0.25__tar.gz

{sxs-2024.0.23 → sxs-2024.0.25}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2024.0.23
-date-released: 2024-11-24
+version: 2024.0.25
+date-released: 2024-12-01

{sxs-2024.0.23 → sxs-2024.0.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sxs
-Version: 2024.0.23
+Version: 2024.0.25
 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-2024.0.25/sxs/__version__.py

@@ -0,0 +1 @@
+__version__ = "2024.0.25"

{sxs-2024.0.23 → sxs-2024.0.25}/sxs/waveforms/format_handlers/grathena.py

@@ -1,6 +1,7 @@
 from ... import sxs_directory
 from . import nrar
 
+
 def load(file, **kwargs):
     """Load a waveform from a GR-Athena++ `tar` file.
 
@@ -13,11 +14,11 @@ def load(file, **kwargs):
     ================
     subfile : str
         The name of the subfile within the `tar` file to read.
-        Default is "rh_Asymptotic_GeometricUnits.h5".  Other
-        potentially useful values replace "rh" with "rPsi4" and/or
-        "Asymptotic" with "CCE" or "FiniteRadii".
+        Default is "rh_CCE_GeometricUnits.h5".  Other potentially
+        useful values replace "rh" with "rPsi4" and/or "CCE" with
+        "Asymptotic" or "FiniteRadii".
     radius : str
-        The extraction radius to use.  Default is "100.00".
+        The extraction radius to use.  Default is "50.00".
     
     Notes
     =====
@@ -59,19 +60,27 @@ def load(file, **kwargs):
     * "120.00"
     * "140.00"
 
-    Note the two 0s after the decimal point.  The `FiniteRadii` and
+    (Note the two 0s after the decimal point.)  The `FiniteRadii` and
     `Asymptotic` data generally contain all of the above radii, while
     the `CCE` data generally contains only the "50.00" and "100.00"
-    radius.
+    radius.  The catalog paper uses "50.00" as the radius when
+    discussing properties of the waveforms, possibly because CCE only
+    "exhibits convergence behavior" for data from that radius.  They
+    also use "100.00" for "extrapolated" waveforms some times.  The
+    default used here is "50.00".
 
     """
-
     from pathlib import Path
     import tarfile
 
     resolution = Path(file).stem
-    subfile = kwargs.pop("subfile", "rh_Asymptotic_GeometricUnits.h5")
-    radius = kwargs.pop("radius", "100.00")
+    subfile = kwargs.pop("subfile", "rh_CCE_GeometricUnits.h5")
+    radius = kwargs.pop("radius", "50.00")
+
+    if subfile.startswith("rPsi4"):
+        data_type = nrar.psi4
+    elif subfile.startswith("rh"):
+        data_type = nrar.h
 
     with tarfile.open(file, "r") as tf:
         tf_names = [tfi.name for tfi in tf]
@@ -81,9 +90,15 @@ def load(file, **kwargs):
             h5file,
             h5_group=radius,
             frame_type=nrar.Inertial,
-            data_type=nrar.h,
+            data_type=data_type,
             m_is_scaled_out=True,
             r_is_scaled_out=True,
         )
 
+    w._metadata["frame_type"] = "inertial"
+    if subfile.startswith("rPsi4"):
+        w._metadata["data_type"] = "psi4"
+    elif subfile.startswith("rh"):
+        w._metadata["data_type"] = "h"
+
     return w

sxs-2024.0.23/sxs/__version__.py

@@ -1 +0,0 @@
-__version__ = "2024.0.23"