Merge remote-tracking branch 'upstream/master'

Author: kyleaoman

pyproject.toml

@@ -3,18 +3,18 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
-packages = ["velociraptor"]
+packages = ["velociraptor", "velociraptor.catalogue", "velociraptor.fitting_formulae", "velociraptor.observations", "velociraptor.autoplotter", "velociraptor.particles", "velociraptor.swift", "velociraptor.tools"]
 
 [project]
 name = "velociraptor-python"
-version="0.16.1"
+version="0.18.0"
 authors = [
     { name="Josh Borrow", email="[email protected]" },
     { name="Kyle Oman", email="[email protected]" },
 ]
 description="Velociraptor catalogue reading routines."
 readme = "README.md"
-requires-python = ">3.6.0"
+requires-python = ">3.10.0"
 classifiers = [
     "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
     "Operating System :: OS Independent",
@@ -33,4 +33,4 @@ dependencies = [
 
 [project.scripts]
 velociraptor-plot = "velociraptor.velociraptor_plot:velociraptor_plot"
-velociraptor-compute-box-size-correction = "velociraptor.velociraptor_compute_box_size_correction:velociraptor_compute_box_size_correction"
+velociraptor-compute-box-size-correction = "velociraptor.velociraptor_compute_box_size_correction:velociraptor_compute_box_size_correction"

setup.py

@@ -1 +1 @@
-__version__ = "0.17.0"
+__version__ = "0.18.0"

velociraptor/__version__.py

@@ -141,7 +141,9 @@ def _register_metadata(self, handle: h5py.File):
         """
         metadata = handle[self.name].attrs
         factor = (
-            metadata["Conversion factor to CGS (including cosmological corrections)"][0]
+            metadata[
+                "Conversion factor to physical CGS (including cosmological corrections)"
+            ][0]
             * unyt.A ** metadata["U_I exponent"][0]
             * unyt.cm ** metadata["U_L exponent"][0]
             * unyt.g ** metadata["U_M exponent"][0]
@@ -374,6 +376,8 @@ def _register_elements(self, handle: h5py.File):
         """
         h5group = handle[self.name] if self.name != "" else handle["/"]
         for (key, h5obj) in h5group.items():
+            if key == "Cells":
+                continue
             if isinstance(h5obj, h5py.Group):
                 el = CatalogueGroup(self.file_name, f"{self.name}/{key}", handle)
                 dynamically_register_properties(el)
@@ -526,22 +530,21 @@ def _register_quantities(self):
         """
         with h5py.File(self.file_name, "r") as handle:
             self.root = CatalogueGroup(self.file_name, "", handle)
-            cosmology = handle["SWIFT/Cosmology"].attrs
+            cosmology = handle["Cosmology"].attrs
             # set up a dummy units object for compatibility with the old VR API
             self.units = SimpleNamespace()
             self.a = cosmology["Scale-factor"][0]
             self.units.scale_factor = cosmology["Scale-factor"][0]
             self.z = cosmology["Redshift"][0]
             self.units.redshift = cosmology["Redshift"][0]
 
-            swift_units = SWIFTUnitsMockup(dict(handle["SWIFT/Units"].attrs))
+            swift_units = SWIFTUnitsMockup(dict(handle["Units"].attrs))
             self.cosmology = swift_cosmology_to_astropy(dict(cosmology), swift_units)
 
             # get the box size and length unit from the SWIFT header and unit metadata
             boxsize = handle["SWIFT/Header"].attrs["BoxSize"][0]
             boxsize_unit = (
-                handle["SWIFT/InternalCodeUnits"].attrs["Unit length in cgs (U_L)"][0]
-                * unyt.cm
+                handle["Units"].attrs["Unit length in cgs (U_L)"][0] * unyt.cm
             ).in_base("galactic")
             boxsize *= boxsize_unit
             physical_boxsize = self.a * boxsize