sxs 2025.0.8__py3-none-any.whl → 2025.0.10__py3-none-any.whl

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2025.0.8"
+__version__ = "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")
 
 
@@ -233,7 +235,7 @@ def Simulation(location, *args, **kwargs):
                 )
                 warn(message)
                 new_location = f"{superseding}{input_version}"
-                if input_lev_number:
+                if input_lev_number is not None:
                     new_location += f"/Lev{input_lev_number}"
                 return Simulation(new_location, *args, **kwargs)
 
@@ -250,7 +252,7 @@ def Simulation(location, *args, **kwargs):
     # If Lev is given as part of `location`, use it; otherwise, use the highest available
     lev_numbers = metadata.get(
         "lev_numbers",
-        sorted({lev_num for f in metadata.get("files", []) if (lev_num:=lev_number(f))})
+        sorted({lev_num for f in metadata.get("files", []) if (lev_num:=lev_number(f)) is not None})
     )
     if not lev_numbers:
         raise ValueError(f"Could not find Levs for {location}")
@@ -259,7 +261,10 @@ def Simulation(location, *args, **kwargs):
             f"Lev number '{input_lev_number}' not found in simulation files for {sxs_id}"
         )
     max_lev_number = max(lev_numbers)
-    output_lev_number = input_lev_number or max_lev_number
+    if input_lev_number is not None:
+        output_lev_number = input_lev_number
+    else:
+        output_lev_number = max_lev_number
     if output_lev_number is None:
         raise ValueError(
             f"No Lev number found for {location}"
@@ -270,7 +275,7 @@ def Simulation(location, *args, **kwargs):
     # or a less-than-maximal Lev
     if (
         version_is_not_default
-        or (lev_numbers and output_lev_number != max_lev_number)
+        or output_lev_number != max_lev_number
     ):
         metadata = None
 
@@ -499,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}"
         )
@@ -797,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):
@@ -807,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
         )
 
@@ -819,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
         )
 
@@ -866,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"
+            ),
             "/"
         )
 
@@ -884,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}"
         )
 
@@ -922,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.8.dist-info → sxs-2025.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.8
+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.8.dist-info → sxs-2025.0.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sxs/__init__.py,sha256=8PntABL6yx7Ad70hP7WedNAVDTZiwm_2At5xIQGo4k8,2610
-sxs/__version__.py,sha256=T6-wsPrw9CRtaYHLEWomkUB0ZeTyias2V5LZbbcYNIs,25
+sxs/__version__.py,sha256=HgC8cXi2VtVN2ag53nQXNmDS6Gzg6fRu6DgWCgu8Djs,26
 sxs/handlers.py,sha256=jVV-HK-omzoBx5N2wcpLHvyoWq86hUfWCjnGbPpD91I,18343
 sxs/juliapkg.json,sha256=-baaa3Za_KBmmiGjlh2YYLWmvUvZl6GaKKXwNI4S7qU,178
 sxs/time_series.py,sha256=OKaLg8tFyrtKcef7900ri-a0C6A8wKxA68KovZXvH6I,41081
@@ -18,7 +18,7 @@ sxs/metadata/metric.py,sha256=Tsig1Jm50OO8r89zfjCuQ4i3JAoiazSb4J9qYtPWKgM,41
 sxs/simulations/__init__.py,sha256=eXkheYhRaYyKjul5J1IXpoJ7Wq4nr3Tgwr-HSS3BTek,156
 sxs/simulations/analyze.py,sha256=YwX0i_GRATRpvp7T8VheShkclvqYsraGDDKEkJQxJnw,11530
 sxs/simulations/local.py,sha256=e77SeaWMl2PWX_EndQtShOXZxcFKhQsUDQ55R2Njcuc,43
-sxs/simulations/simulation.py,sha256=tzI1s15mU1CDdst7XZRD4UehtbkRvIao16ONTAA0zfI,42353
+sxs/simulations/simulation.py,sha256=t7t7rXNDQFC-1llOQNdTChVXemuImEiEa-OYBts_JFs,43274
 sxs/simulations/simulations.py,sha256=sMle89VoD1CQni1N23Vjo3h2yj9LHHAtuaB_qfD3Wgg,109
 sxs/utilities/__init__.py,sha256=WSStlqljfgQheMxHGfuofSc5LdmASGvO3FNO3f_zaT0,4806
 sxs/utilities/bitwise.py,sha256=G9ZNYgwDQRhq5wbDf-p2HcUqkEP_IRDiQoXW4KyU17k,13205
@@ -82,7 +82,7 @@ sxs/zenodo/api/__init__.py,sha256=EM_eh4Q8R5E0vIfMhyIR1IYFfOBu6vA0UTasgX9gHys,21
 sxs/zenodo/api/deposit.py,sha256=J4RGvGjh0cEOrN4bBZWEDcPAhNscqB2fzLlvRZ5HTHM,36948
 sxs/zenodo/api/login.py,sha256=Yz0ytgi81_5BpDzhrS0WPMXlvU2qUaCK8yn8zxfEbko,18007
 sxs/zenodo/api/records.py,sha256=nKkhoHZ95CTztHF9Zzaug5p7IiUCJG4Em1i-l-WqH6U,3689
-sxs-2025.0.8.dist-info/METADATA,sha256=61LeHMJCrGehO9QH6lA0dTXDkCLE-raLMRjFjKE6hhc,9311
-sxs-2025.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sxs-2025.0.8.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2025.0.8.dist-info/RECORD,,
+sxs-2025.0.10.dist-info/METADATA,sha256=sVijAvq2hDkEYG8IXie_Vna6odb72NN6xKIG7ZoKYFg,9312
+sxs-2025.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sxs-2025.0.10.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2025.0.10.dist-info/RECORD,,