sxs 2025.0.9__tar.gz → 2025.0.10__tar.gz

{sxs-2025.0.9 → sxs-2025.0.10}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2025.0.9
-date-released: 2025-04-16
+version: 2025.0.10
+date-released: 2025-04-28

{sxs-2025.0.9 → sxs-2025.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.9
+Version: 2025.0.10
 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-2025.0.10/sxs/__version__.py

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

{sxs-2025.0.9 → sxs-2025.0.10}/sxs/simulations/simulation.py

@@ -7,7 +7,7 @@ from ..utilities import (
 )
 
 
-def search_prefixes(file, lev, files, ending=""):
+def search_prefixes(file, sxs_id_stem, lev, files, ending=""):
     """Find the actual filename present in the list of files
 
     Different versions of Zenodo and CaltechDATA place different
@@ -20,16 +20,18 @@ def search_prefixes(file, lev, files, ending=""):
     there is just one Lev in a simulation, and we try to save the
     files in a consistent way — including the Lev with the appropriate
     separator, different versions of Zenodo and CaltechDATA will
-    either allow or silently remove that prefix.  The simplest
+    either allow or silently remove that prefix.  On top of all that,
+    early uploads also got the SXS ID as a prefix.  The simplest
     approach is to just search over all possibilities, for which
     filename is actually present in the data.  That's what this
     function does.
     
     """
-    for prefix in [f"{lev}:", f"{lev}/", ""]:
-        fn = f"{prefix}{file}"
-        if f"{fn}{ending}" in files:
-            return fn
+    for directory in ["", f"{sxs_id_stem}/", f"{sxs_id_stem}:"]:
+        for prefix in [f"{lev}:", f"{lev}/", ""]:
+            fn = f"{directory}{prefix}{file}"
+            if f"{fn}{ending}" in files:
+                return fn
     raise ValueError(f"{file}{ending} not found in any form in files")
 
 
@@ -502,11 +504,12 @@ class SimulationBase:
 
     @property
     def metadata_path(self):
-        for separator in [":", "/"]:
-            for ending in [".json", ".txt"]:
-                for prefix in ["", f"{self.lev}{separator}" if self.lev else ""]:
-                    if (fn := f"{prefix}metadata{ending}") in self.files:
-                        return fn
+        for beginning in ["", f"{self.sxs_id_stem}/", f"{self.sxs_id_stem}:"]:
+            for separator in [":", "/"]:
+                for ending in [".json", ".txt"]:
+                    for prefix in ["", f"{self.lev}{separator}" if self.lev else ""]:
+                        if (fn := f"{beginning}{prefix}metadata{ending}") in self.files:
+                            return fn
         raise ValueError(
             f"Metadata file not found in simulation files for {self.location}"
         )
@@ -800,7 +803,10 @@ class Simulation_v1(SimulationBase):
 
     @property
     def horizons_path(self):
-        return search_prefixes("Horizons.h5", self.lev, self.files)
+        return search_prefixes(
+            "Horizons.h5",
+            self.sxs_id_stem, self.lev, self.files
+        )
 
     @property
     def strain_path(self):
@@ -810,7 +816,10 @@ class Simulation_v1(SimulationBase):
             else "OutermostExtraction.dir"
         )
         return (
-            search_prefixes("rhOverM_Asymptotic_GeometricUnits_CoM.h5", self.lev, self.files),
+            search_prefixes(
+                "rhOverM_Asymptotic_GeometricUnits_CoM.h5",
+                self.sxs_id_stem, self.lev, self.files
+            ),
             extrapolation
         )
 
@@ -822,7 +831,10 @@ class Simulation_v1(SimulationBase):
             else "OutermostExtraction.dir"
         )
         return (
-            search_prefixes("rMPsi4_Asymptotic_GeometricUnits_CoM.h5", self.lev, self.files),
+            search_prefixes(
+                "rMPsi4_Asymptotic_GeometricUnits_CoM.h5",
+                self.sxs_id_stem, self.lev, self.files
+            ),
             extrapolation
         )
 
@@ -869,12 +881,18 @@ class Simulation_v2(SimulationBase):
 
     @property
     def horizons_path(self):
-        return search_prefixes("Horizons.h5", self.lev, self.files)
+        return search_prefixes(
+            "Horizons.h5",
+            self.sxs_id_stem, self.lev, self.files
+        )
 
     @property
     def strain_path(self):
         return (
-            search_prefixes(f"Strain_{self.extrapolation}", self.lev, self.files, ".h5"),
+            search_prefixes(
+                f"Strain_{self.extrapolation}",
+                self.sxs_id_stem, self.lev, self.files, ".h5"
+            ),
             "/"
         )
 
@@ -887,7 +905,10 @@ class Simulation_v2(SimulationBase):
         )
         prefix = f"{self.lev}:" if len(self.lev_numbers)>1 else ""
         return (
-            search_prefixes(f"ExtraWaveforms", self.lev, self.files, ".h5"),
+            search_prefixes(
+                f"ExtraWaveforms",
+                self.sxs_id_stem, self.lev, self.files, ".h5"
+            ),
             f"/rMPsi4_Asymptotic_GeometricUnits_CoM_Mem/{extrapolation}"
         )
 
@@ -925,17 +946,26 @@ class Simulation_v3(Simulation_v2):
     @property
     def strain_path(self):
         return (
-            search_prefixes(f"Strain_{self.extrapolation}", self.lev, self.files, ".h5"),
+            search_prefixes(
+                f"Strain_{self.extrapolation}",
+                self.sxs_id_stem, self.lev, self.files, ".h5"
+            ),
             "/"
         ) if self.extrapolation == self.default_extrapolation else (
-            search_prefixes("ExtraWaveforms", self.lev, self.files, ".h5"),
+            search_prefixes(
+                "ExtraWaveforms",
+                self.sxs_id_stem, self.lev, self.files, ".h5"
+            ),
             f"/Strain_{self.extrapolation}.dir"
         )
 
     @property
     def psi4_path(self):
         return (
-            search_prefixes("ExtraWaveforms", self.lev, self.files, ".h5"),
+            search_prefixes(
+                "ExtraWaveforms",
+                self.sxs_id_stem, self.lev, self.files, ".h5"
+            ),
             f"/Psi4_{self.extrapolation}.dir"
         )
 

{sxs-2025.0.9 → sxs-2025.0.10}/tests/test_simulation.py

@@ -119,6 +119,24 @@ def test_sxs_load_v3_levs():
     assert sm1.metadata != s0.metadata
 
 
+@pytest.mark.many_downloads  # runs only with pytest flag ` --run_many_downloads`
+def test_sxs_load_all_doi_versions():
+    print()
+    for sxs_id in list(range(303, 324+1)) + list(range(4425, 4434+1)):
+        sxs_id = f"SXS:BBH:{sxs_id:04}"
+        print(f"    Loading {sxs_id}")
+        sim = sxs.load(sxs_id, ignore_deprecation=True)
+        for doi_version in sim.metadata["DOI_versions"]:
+            if not doi_version:  # Skip the default version, which was loaded above
+                continue
+            # This line will actually load the metadata, which is already a strong test
+            sim = sxs.load(f"{sxs_id}{doi_version}", ignore_deprecation=True)
+            assert sim.metadata_path
+            assert sim.horizons_path
+            assert sim.strain_path
+            assert sim.psi4_path
+
+
 @pytest.mark.many_downloads  # runs only with pytest flag ` --run_many_downloads`
 def test_sxs_load_v3_catalog():
     # This test goes right up to the point of loading every simulation

sxs-2025.0.9/sxs/__version__.py

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