Lint with updated black.

SWIFTSIM · Oct 11, 2023 · 929f3e6 · 929f3e6
1 parent eacc9bb
commit 929f3e6
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 60 deletions.
diff --git a/swiftgalaxy/halo_finders.py b/swiftgalaxy/halo_finders.py
@@ -288,7 +288,7 @@ def centre(self) -> cosmo_array:
                 ]
             ),
             comoving=False,  # velociraptor gives physical centres!
-            cosmo_factor=cosmo_factor(a ** 1, self.scale_factor),
+            cosmo_factor=cosmo_factor(a**1, self.scale_factor),
         ).to_comoving()
 
     @property
@@ -323,7 +323,7 @@ def velocity_centre(self) -> cosmo_array:
                 ]
             ),
             comoving=False,
-            cosmo_factor=cosmo_factor(a ** 0, self.scale_factor),
+            cosmo_factor=cosmo_factor(a**0, self.scale_factor),
         ).to_comoving()
 
     def __getattr__(self, attr: str) -> Any:
@@ -584,7 +584,7 @@ def centre(self) -> cosmo_array:
                 u.kpc
             ),  # maybe comoving, ensure physical
             comoving=False,
-            cosmo_factor=cosmo_factor(a ** 1, self._caesar.simulation.scale_factor),
+            cosmo_factor=cosmo_factor(a**1, self._caesar.simulation.scale_factor),
         ).to_comoving()
 
     @property
@@ -603,7 +603,7 @@ def velocity_centre(self) -> cosmo_array:
         return cosmo_array(
             getattr(self._group, vcentre_attr).to(u.km / u.s),
             comoving=False,
-            cosmo_factor=cosmo_factor(a ** 0, self._caesar.simulation.scale_factor),
+            cosmo_factor=cosmo_factor(a**0, self._caesar.simulation.scale_factor),
         ).to_comoving()
 
     def __getattr__(self, attr: str) -> Any:

diff --git a/swiftgalaxy/reader.py b/swiftgalaxy/reader.py
@@ -655,7 +655,7 @@ def spherical_coordinates(self) -> _CoordinateHelper:
                 units=unyt.rad,
                 comoving=r.comoving,
                 cosmo_factor=cosmo_factor(
-                    a ** 0, scale_factor=r.cosmo_factor.scale_factor
+                    a**0, scale_factor=r.cosmo_factor.scale_factor
                 ),
             )
             if self.cylindrical_coordinates is not None:
@@ -668,7 +668,7 @@ def spherical_coordinates(self) -> _CoordinateHelper:
                     units=unyt.rad,
                     comoving=r.comoving,
                     cosmo_factor=cosmo_factor(
-                        a ** 0, scale_factor=r.cosmo_factor.scale_factor
+                        a**0, scale_factor=r.cosmo_factor.scale_factor
                     ),
                 )
                 phi[phi < 0] = phi[phi < 0] + 2 * np.pi * unyt.rad
@@ -834,7 +834,7 @@ def cylindrical_coordinates(self) -> _CoordinateHelper:
                     units=unyt.rad,
                     comoving=rho.comoving,
                     cosmo_factor=cosmo_factor(
-                        a ** 0, scale_factor=rho.cosmo_factor.scale_factor
+                        a**0, scale_factor=rho.cosmo_factor.scale_factor
                     ),
                 )
             z = self.cartesian_coordinates.z
@@ -1427,7 +1427,7 @@ def centre(self) -> cosmo_array:
                 units=transform_units,
                 comoving=True,
                 cosmo_factor=cosmo_factor(
-                    a ** 1, scale_factor=self.metadata.scale_factor
+                    a**1, scale_factor=self.metadata.scale_factor
                 ),
             ),
             transform,
@@ -1444,7 +1444,7 @@ def velocity_centre(self) -> cosmo_array:
                 units=transform_units,
                 comoving=True,
                 cosmo_factor=cosmo_factor(
-                    a ** 0, scale_factor=self.metadata.scale_factor
+                    a**0, scale_factor=self.metadata.scale_factor
                 ),
             ),
             transform,

diff --git a/tests/test_coordinate_transformations.py b/tests/test_coordinate_transformations.py
@@ -17,91 +17,91 @@
         reltol * 10,
         units=u.kpc,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
     ),
     "dark_matter": cosmo_array(
         reltol * 100,
         units=u.kpc,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
     ),
     "stars": cosmo_array(
         reltol * 5,
         units=u.kpc,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
     ),
     "black_holes": cosmo_array(
-        abstol_c, comoving=True, cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0)
+        abstol_c, comoving=True, cosmo_factor=cosmo_factor(a**1, scale_factor=1.0)
     ),
 }
 expected_z = {
     "gas": cosmo_array(
         reltol,
         units=u.kpc,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
     ),
     "dark_matter": cosmo_array(
         reltol * 100,
         units=u.kpc,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
     ),
     "stars": cosmo_array(
         reltol * 500,
         units=u.pc,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
     ),
     "black_holes": cosmo_array(
-        abstol_c, comoving=True, cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0)
+        abstol_c, comoving=True, cosmo_factor=cosmo_factor(a**1, scale_factor=1.0)
     ),
 }
 expected_vxy = {
     "gas": cosmo_array(
         reltol * 100,
         units=u.km / u.s,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
     ),
     "dark_matter": cosmo_array(
         reltol * 100,
         units=u.km / u.s,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
     ),
     "stars": cosmo_array(
         reltol * 50,
         units=u.km / u.s,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
     ),
     "black_holes": cosmo_array(
-        abstol_v, comoving=True, cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0)
+        abstol_v, comoving=True, cosmo_factor=cosmo_factor(a**0, scale_factor=1.0)
     ),
 }
 expected_vz = {
     "gas": cosmo_array(
         reltol * 10,
         units=u.km / u.s,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
     ),
     "dark_matter": cosmo_array(
         reltol * 100,
         units=u.km / u.s,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
     ),
     "stars": cosmo_array(
         reltol * 10,
         units=u.km / u.s,
         comoving=True,
-        cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+        cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
     ),
     "black_holes": cosmo_array(
-        abstol_v, comoving=True, cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0)
+        abstol_v, comoving=True, cosmo_factor=cosmo_factor(a**0, scale_factor=1.0)
     ),
 }
 
@@ -265,7 +265,7 @@ def test_manual_recentring(self, sg, particle_name, coordinate_name, before_load
             [1, 1, 1],
             units=u.Mpc,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
         )
         sg.recentre(new_centre)
         xyz = getattr(getattr(sg, particle_name), f"{coordinate_name}")
@@ -289,7 +289,7 @@ def test_manual_recentring_velocity(
             [100, 100, 100],
             units=u.km / u.s,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
         )
         sg.recentre_velocity(new_centre)
         vxyz = getattr(getattr(sg, particle_name), f"{velocity_name}")
@@ -315,7 +315,7 @@ def test_translate(self, sg, particle_name, coordinate_name, before_load):
             [1, 1, 1],
             units=u.Mpc,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
         )
         sg.translate(translation)
         xyz = getattr(getattr(sg, particle_name), f"{coordinate_name}")
@@ -337,7 +337,7 @@ def test_boost(self, sg, particle_name, velocity_name, before_load):
             [100, 100, 100],
             u.km / u.s,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
         )
         sg.boost(boost)
         vxyz = getattr(getattr(sg, particle_name), f"{velocity_name}")
@@ -389,7 +389,7 @@ def test_box_wrap(self, sg, particle_name, coordinate_name):
             boxsize = cosmo_array(
                 sg.metadata.boxsize,
                 comoving=True,
-                cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+                cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
             )
         xyz_before = getattr(getattr(sg, particle_name), f"{coordinate_name}")
         sg.translate(-2 * boxsize)  # -2x box size
@@ -412,7 +412,7 @@ def test_translate_then_rotate(self, sg, before_load):
             [1, 1, 1],
             units=u.Mpc,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
         )
         sg.translate(translation)
         sg.rotate(Rotation.from_matrix(rot))
@@ -436,7 +436,7 @@ def test_rotate_then_translate(self, sg, before_load):
             [1, 1, 1],
             units=u.Mpc,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
         )
         sg.translate(translation)
         xyz = sg.gas.coordinates
@@ -458,7 +458,7 @@ def test_boost_then_rotate(self, sg, before_load):
             [100, 100, 100],
             units=u.km / u.s,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
         )
         sg.boost(boost)
         sg.rotate(Rotation.from_matrix(rot))
@@ -482,7 +482,7 @@ def test_rotate_then_boost(self, sg, before_load):
             [100, 100, 100],
             units=u.km / u.s,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
         )
         sg.boost(boost)
         vxyz = sg.gas.velocities
@@ -515,7 +515,7 @@ def test_copied_coordinate_transform(self, sg):
             [1, 1, 1],
             units=u.Mpc,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
         )
         sg.translate(translation)
         sg2 = SWIFTGalaxy(
@@ -535,7 +535,7 @@ def test_copied_velocity_transform(self, sg):
             [1, 1, 1],
             units=u.Mpc,
             comoving=True,
-            cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+            cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
         )
         sg.translate(translation)
         sg2 = SWIFTGalaxy(

diff --git a/tests/test_derived_coordinates.py b/tests/test_derived_coordinates.py
@@ -343,7 +343,7 @@ class TestInteractionWithCoordinateTransformations:
                     np.zeros(3),
                     units=u.Mpc,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
                 ),
             ),
             (
@@ -352,7 +352,7 @@ class TestInteractionWithCoordinateTransformations:
                     np.zeros(3),
                     units=u.km / u.s,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
                 ),
             ),
             (
@@ -361,7 +361,7 @@ class TestInteractionWithCoordinateTransformations:
                     np.zeros(3),
                     units=u.Mpc,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
                 ),
             ),
             (
@@ -370,7 +370,7 @@ class TestInteractionWithCoordinateTransformations:
                     np.zeros(3),
                     units=u.km / u.s,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
                 ),
             ),
             ("rotate", Rotation.from_matrix(np.eye(3))),
@@ -419,7 +419,7 @@ def test_void_derived_coordinates(
                     np.ones(3),
                     units=u.Mpc,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 1, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**1, scale_factor=1.0),
                 ),
             ),
             (
@@ -428,7 +428,7 @@ def test_void_derived_coordinates(
                     100 * np.ones(3),
                     units=u.km / u.s,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
                 ),
             ),
             (
@@ -437,7 +437,7 @@ def test_void_derived_coordinates(
                     np.ones(3),
                     units=u.Mpc,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
                 ),
             ),
             (
@@ -446,7 +446,7 @@ def test_void_derived_coordinates(
                     100 * np.ones(3),
                     units=u.km / u.s,
                     comoving=True,
-                    cosmo_factor=cosmo_factor(a ** 0, scale_factor=1.0),
+                    cosmo_factor=cosmo_factor(a**0, scale_factor=1.0),
                 ),
             ),
             ("rotate", Rotation.from_rotvec(np.pi / 2 * np.array([1, 1, 1]))),

diff --git a/tests/test_halo_finders.py b/tests/test_halo_finders.py
@@ -344,12 +344,15 @@ def test_spatial_mask_applied(self, caesar):
         create_toysnap()
         sg = SWIFTGalaxy(toysnap_filename, caesar)
         for particle_type in present_particle_types.values():
-            assert getattr(sg, particle_type).masses.size == dict(
-                gas=n_g_b // 2 + n_g,
-                dark_matter=n_dm_b // 2 + n_dm,
-                stars=n_s,
-                black_holes=n_bh,
-            )[particle_type]
+            assert (
+                getattr(sg, particle_type).masses.size
+                == dict(
+                    gas=n_g_b // 2 + n_g,
+                    dark_matter=n_dm_b // 2 + n_dm,
+                    stars=n_s,
+                    black_holes=n_bh,
+                )[particle_type]
+            )
         remove_toysnap()