Precise conversions (#99)

* More specific conversion.

* More precise conversions.

Author: kyleaoman

examples/SWIFTGalaxy_Colibre_QuickStart.ipynb

@@ -253,7 +253,7 @@
     "    fig = plt.figure(fignum, figsize=(10, 3))\n",
     "    sp1, sp2, sp3 = [fig.add_subplot(1, 3, i) for i in range(1, 4)]\n",
     "    sp1.imshow(\n",
-    "        matplotlib.colors.LogNorm()(gas_map.to_value(u.solMass / u.kpc**2).T),\n",
+    "        matplotlib.colors.LogNorm()(gas_map.to_physical_value(u.solMass / u.kpc**2).T),\n",
     "        cmap=\"viridis\",\n",
     "        extent=disc_region,\n",
     "        origin=\"lower\",\n",
@@ -271,7 +271,7 @@
     "        transform=sp1.transAxes,\n",
     "    )\n",
     "    sp2.imshow(\n",
-    "        matplotlib.colors.LogNorm()(dm_map.to_value(u.solMass / u.kpc**2).T),\n",
+    "        matplotlib.colors.LogNorm()(dm_map.to_physical_value(u.solMass / u.kpc**2).T),\n",
     "        cmap=\"inferno\",\n",
     "        extent=halo_region,\n",
     "        origin=\"lower\",\n",
@@ -294,7 +294,7 @@
     "        transform=sp2.transAxes,\n",
     "    )\n",
     "    sp3.imshow(\n",
-    "        matplotlib.colors.LogNorm()(star_map.to_value(u.solMass / u.kpc**2).T),\n",
+    "        matplotlib.colors.LogNorm()(star_map.to_physical_value(u.solMass / u.kpc**2).T),\n",
     "        cmap=\"magma\",\n",
     "        extent=disc_region,\n",
     "        origin=\"lower\",\n",
@@ -424,7 +424,7 @@
     "from scipy.spatial.transform import Rotation\n",
     "\n",
     "Lstars = sg.halo_catalogue.exclusive_sphere_10kpc.angular_momentum_stars.squeeze()\n",
-    "zhat = (Lstars / np.sqrt(np.sum(Lstars**2))).to_value(\n",
+    "zhat = (Lstars / np.sqrt(np.sum(Lstars**2))).to_physical_value(\n",
     "    u.dimensionless\n",
     ")  # we'll align L with the z-axis\n",
     "arb = (\n",
@@ -467,8 +467,8 @@
    ],
    "source": [
     "plt.plot(\n",
-    "    sg.stars.spherical_velocities.r.to_value(u.km / u.s),\n",
-    "    sg.stars.spherical_velocities.phi.to_value(u.km / u.s),\n",
+    "    sg.stars.spherical_velocities.r.to_physical_value(u.km / u.s),\n",
+    "    sg.stars.spherical_velocities.phi.to_physical_value(u.km / u.s),\n",
     "    \",k\",\n",
     "    rasterized=True,\n",
     ")\n",

swiftgalaxy/halo_catalogues.py

@@ -847,9 +847,11 @@ def lazy_mask() -> NDArray:
                 """
                 mask = getattr(
                     sg, group_name
-                )._particle_dataset.group_nr_bound.to_value(
+                )._particle_dataset.group_nr_bound.to_physical_value(
                     u.dimensionless
-                ) == self.input_halos.halo_catalogue_index.to_value(u.dimensionless)
+                ) == self.input_halos.halo_catalogue_index.to_physical_value(
+                    u.dimensionless
+                )
                 if mask_loaded:
                     # mask the group_nr_bound array that we loaded
                     getattr(sg, group_name)._particle_dataset._group_nr_bound = getattr(

swiftgalaxy/iterator.py

@@ -308,7 +308,7 @@ def _eval_sparse_optimized_solution(self) -> None:
                 )
                 // sm.cell_size[np.newaxis, :, np.newaxis]
             )
-            .to_value(u.dimensionless)
+            .to_comoving_value(u.dimensionless)
             .astype(int)
         )
         unique_region_indices, inv = np.unique(
@@ -377,14 +377,14 @@ def _eval_dense_optimized_solution(self) -> None:
         # in the same grid location
         grid_element_dim = (
             np.max(target_sizes // sm.cell_size[np.newaxis], axis=0)
-            .to_value(u.dimensionless)
+            .to_comoving_value(u.dimensionless)
             .astype(int)
             + 1
         )
         # If the grid doesn't fully cover the box need to add one more grid cell to
         # cover "too much".
         target_grid_offsets, target_grid_indices = np.modf(
-            (target_centres / (grid_element_dim * sm.cell_size)).to_value(
+            (target_centres / (grid_element_dim * sm.cell_size)).to_comoving_value(
                 u.dimensionless
             )
         )
@@ -425,7 +425,7 @@ def _eval_dense_optimized_solution(self) -> None:
                 np.prod(
                     np.ceil(
                         np.diff(unique_regions, axis=2).squeeze(axis=2) / sm.cell_size
-                    ).to_value(u.dimensionless),
+                    ).to_comoving_value(u.dimensionless),
                     axis=1,
                 )
             )
@@ -435,7 +435,7 @@ def _eval_dense_optimized_solution(self) -> None:
                 np.prod(
                     np.ceil(
                         np.diff(unique_regions, axis=2).squeeze(axis=2) / sm.cell_size
-                    ).to_value(u.dimensionless)
+                    ).to_comoving_value(u.dimensionless)
                     + 1,
                     axis=1,
                 )