updated unit tests for test_scene.py and test_geometry.py. Removed the "swap_axes" argument from some functions where it was not needed.

Author: jewettaijfc

tests/test_components/test_geometry.py

@@ -952,7 +952,8 @@ def test_to_gds(geometry, tmp_path):
     assert len(cell.polygons) == 0
 
 
-def test_custom_surface_geometry(tmp_path):
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_custom_surface_geometry(swap_axes, tmp_path):
     # create tetrahedron STL
     vertices = np.array([[0, 0, 0], [1, 0, 0], [0, 1, 0], [0, 0, 1]])
     faces = np.array([[1, 2, 3], [0, 3, 2], [0, 1, 3], [0, 2, 1]])
@@ -985,9 +986,13 @@ def test_custom_surface_geometry(tmp_path):
     assert np.isclose(geom.volume(), 1 / 6)
 
     # test intersections
-    assert shapely.equals(geom.intersections_plane(x=0), shapely.Polygon([[0, 0], [0, 1], [1, 0]]))
     assert shapely.equals(
-        geom.intersections_plane(z=0.5), shapely.Polygon([[0, 0], [0, 0.5], [0.5, 0]])
+        geom.intersections_plane(x=0, swap_axes=swap_axes),
+        shapely.Polygon([[0, 0], [0, 1], [1, 0]]),
+    )
+    assert shapely.equals(
+        geom.intersections_plane(z=0.5, swap_axes=swap_axes),
+        shapely.Polygon([[0, 0], [0, 0.5], [0.5, 0]]),
     )
 
     # test inside
@@ -996,7 +1001,7 @@ def test_custom_surface_geometry(tmp_path):
 
     # test plot
     _, ax = plt.subplots()
-    _ = geom.plot(z=0.1, ax=ax)
+    _ = geom.plot(z=0.1, ax=ax, swap_axes=swap_axes)
     plt.close()
 
     # test inconsistent winding
@@ -1046,7 +1051,7 @@ def test_custom_surface_geometry(tmp_path):
         boundary_spec=td.BoundarySpec.all_sides(td.PML()),
     )
     _, ax = plt.subplots()
-    _ = sim.plot(y=0, ax=ax)
+    _ = sim.plot(y=0, ax=ax, swap_axes=swap_axes)
     plt.close()
 
     # allow small triangles

tests/test_components/test_scene.py

@@ -50,13 +50,15 @@ def test_validate_components_none():
     assert SCENE._validate_num_mediums(val=None) is None
 
 
-def test_plot_eps():
-    ax = SCENE_FULL.plot_eps(x=0)
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_eps(swap_axes):
+    ax = SCENE_FULL.plot_eps(x=0, swap_axes=swap_axes)
     SCENE_FULL._add_cbar_eps(eps_min=1, eps_max=2, ax=ax)
     plt.close()
 
 
-def test_plot_eps_multiphysics():
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_eps_multiphysics(swap_axes):
     s = td.Scene(
         structures=[
             td.Structure(
@@ -70,20 +72,22 @@ def test_plot_eps_multiphysics():
         ]
     )
     assert s.structures[0].medium.name == "SiO2"
-    s.plot_eps(x=0)
+    s.plot_eps(x=0, swap_axes=swap_axes)
 
 
-def test_plot_eps_bounds():
-    _ = SCENE_FULL.plot_eps(x=0, hlim=[-0.45, 0.45])
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_eps_bounds(swap_axes):
+    _ = SCENE_FULL.plot_eps(x=0, hlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot_eps(x=0, vlim=[-0.45, 0.45])
+    _ = SCENE_FULL.plot_eps(x=0, vlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot_eps(x=0, hlim=[-0.45, 0.45], vlim=[-0.45, 0.45])
+    _ = SCENE_FULL.plot_eps(x=0, hlim=[-0.45, 0.45], vlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
 
 
-def test_plot():
-    SCENE_FULL.plot(x=0)
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot(swap_axes):
+    SCENE_FULL.plot(x=0, swap_axes=swap_axes)
     plt.close()
 
 
@@ -93,44 +97,48 @@ def test_plot_1d_scene():
     plt.close()
 
 
-def test_plot_bounds():
-    _ = SCENE_FULL.plot(x=0, hlim=[-0.45, 0.45])
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_bounds(swap_axes):
+    _ = SCENE_FULL.plot(x=0, hlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot(x=0, vlim=[-0.45, 0.45])
+    _ = SCENE_FULL.plot(x=0, vlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot(x=0, hlim=[-0.45, 0.45], vlim=[-0.45, 0.45])
+    _ = SCENE_FULL.plot(x=0, hlim=[-0.45, 0.45], vlim=[-0.45, 0.45], swap_axes=swap_axes)
     plt.close()
 
 
-def test_structure_alpha():
-    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=None)
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_structure_alpha(swap_axes):
+    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=None, swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=-1)
+    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=-1, swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=1)
+    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=1, swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=0.5)
+    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=0.5, swap_axes=swap_axes)
     plt.close()
-    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=0.5, cbar=True)
+    _ = SCENE_FULL.plot_structures_eps(x=0, alpha=0.5, cbar=True, swap_axes=swap_axes)
     plt.close()
     new_structs = [
         td.Structure(geometry=s.geometry, medium=SCENE_FULL.medium) for s in SCENE_FULL.structures
     ]
     S2 = SCENE_FULL.copy(update={"structures": new_structs})
-    _ = S2.plot_structures_eps(x=0, alpha=0.5)
+    _ = S2.plot_structures_eps(x=0, alpha=0.5, swap_axes=swap_axes)
     plt.close()
 
 
-def test_plot_with_units():
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_plot_with_units(swap_axes):
     scene_with_units = SCENE_FULL.updated_copy(plot_length_units="nm")
-    scene_with_units.plot(x=-0.5)
+    scene_with_units.plot(x=-0.5, swap_axes=swap_axes)
 
 
-def test_filter_structures():
+@pytest.mark.parametrize("swap_axes", [True, False])
+def test_filter_structures(swap_axes):
     s1 = td.Structure(geometry=td.Box(size=(1, 1, 1)), medium=SCENE.medium)
     s2 = td.Structure(geometry=td.Box(size=(1, 1, 1), center=(1, 1, 1)), medium=SCENE.medium)
     plane = td.Box(center=(0, 0, 1.5), size=(td.inf, td.inf, 0))
-    SCENE._filter_structures_plane_medium(structures=[s1, s2], plane=plane)
+    SCENE._filter_structures_plane_medium(structures=[s1, s2], plane=plane, swap_axes=swap_axes)
 
 
 def test_get_structure_plot_params():

tidy3d/components/geometry/polyslab.py

@@ -994,16 +994,11 @@ def _find_intersecting_ys_angle_slant(
         return ints_y_sort, ints_angle_sort
 
     @cached_property
-    def bounds(self, swap_axes: bool = False) -> Bound:
+    def bounds(self) -> Bound:
         """Returns bounding box min and max coordinates. The dilation and slant angle are not
         taken into account exactly for speed. Instead, the polygon may be slightly smaller than
         the returned bounds, but it should always be fully contained.
 
-        Parameters
-        -------
-        swap_axes : bool = False
-            Optional: Swap the planar axes? (the axes perpendicular to self.axis)
-
         Returns
         -------
         Tuple[float, float, float], Tuple[float, float float]
@@ -1036,8 +1031,8 @@ def bounds(self, swap_axes: bool = False) -> Bound:
         zmin, zmax = self.slab_bounds
 
         # rearrange axes
-        coords_min = self.unpop_axis_and_swap(zmin, (xmin, ymin), axis=self.axis, swap_axes=swap_axes)
-        coords_max = self.unpop_axis_and_swap(zmax, (xmax, ymax), axis=self.axis, swap_axes=swap_axes)
+        coords_min = self.unpop_axis(zmin, (xmin, ymin), axis=self.axis)
+        coords_max = self.unpop_axis(zmax, (xmax, ymax), axis=self.axis)
         return (tuple(coords_min), tuple(coords_max))
 
     def _extrusion_length_to_offset_distance(self, extrusion: float) -> float:

tidy3d/components/geometry/primitives.py

@@ -379,7 +379,6 @@ def _update_from_bounds(self, bounds: tuple[float, float], axis: Axis) -> Cylind
     @verify_packages_import(["trimesh"])
     def _do_intersections_tilted_plane(
         self, normal: Coordinate, origin: Coordinate, to_2D: MatrixReal4x4,
-        swap_axes: bool = False,
     ) -> list[Shapely]:
         """Return a list of shapely geometries at the plane specified by normal and origin.
 
@@ -391,8 +390,6 @@ def _do_intersections_tilted_plane(
             Vector defining the plane origin.
         to_2D : MatrixReal4x4
             Transformation matrix to apply to resulting shapes.
-        swap_axes : bool = False
-            Optional: Swap coordinates in the plane perpendicular to the normal vector?
 
         Returns
         -------
@@ -403,7 +400,7 @@ def _do_intersections_tilted_plane(
         """
         import trimesh
 
-        z0, (x0, y0) = self.pop_axis_and_swap(self.center, self.axis, swap_axes=swap_axes)
+        z0, (x0, y0) = self.pop_axis(self.center, self.axis)
         half_length = self.finite_length_axis / 2
 
         z_top = z0 + half_length
@@ -445,7 +442,7 @@ def _do_intersections_tilted_plane(
         x = np.hstack((x_bot, x_top))
         y = np.hstack((y_bot, y_top))
         z = np.hstack((np.full_like(x_bot, z_bot), np.full_like(x_top, z_top)))
-        vertices = np.vstack(self.unpop_axis_and_swap(z, (x, y), self.axis, swap_axes=swap_axes)).T
+        vertices = np.vstack(self.unpop_axis(z, (x, y), self.axis)).T
 
         if x_bot.shape[0] == 1:
             m = 1