reverted changes to corner_finder.py and added more changes to geometry/base.py, geometry/primitives.py

Author: jewettaijfc

tidy3d/components/geometry/base.py

@@ -1739,7 +1739,7 @@ def _intersections_normal(self, z: float, transpose: bool = False) -> list:
         z : float
             Position along the axis normal to slab
         transpose : bool
-            Optional: Swap the order of the x and y axis in the geometry data
+            Optional: Swap the order of the x and y axis in the geometry data.
 
         Returns
         -------
@@ -1760,7 +1760,7 @@ def _intersections_side(self, position: float, axis: Axis, transpose: bool = Fal
         axis : int
             Integer index into 'xyz' (0,1,2).
         transpose : bool
-            Optional: Swap the order of the remaining two axes (the ones not equal to axis)
+            Optional: Swap the order of the remaining two axes (the axes not equal to axis).
 
         Returns
         -------
@@ -2098,6 +2098,8 @@ def intersections_plane(
             Position of plane in y direction, only one of x,y,z can be specified to define plane.
         z : float = None
             Position of plane in z direction, only one of x,y,z can be specified to define plane.
+        transpose: bool = False
+            Optional: Swap the order of the coordinates in the two remaining (unspecified) axis?
 
         Returns
         -------
@@ -2483,13 +2485,12 @@ def _derivative_face(
         min_max_index: int,
         axis_normal: Axis,
         derivative_info: DerivativeInfo,
-        transpose: bool = False,
     ) -> float:
         """Compute the derivative w.r.t. shifting a face in the normal direction."""
 
         # normal and tangential dims
-        dim_normal, dims_perp = self.pop_axis("xyz", axis=axis_normal, transpose=transpose)
-        fld_normal, flds_perp = self.pop_axis(("Ex", "Ey", "Ez"), axis=axis_normal, transpose=transpose)
+        dim_normal, dims_perp = self.pop_axis("xyz", axis=axis_normal)
+        fld_normal, flds_perp = self.pop_axis(("Ex", "Ey", "Ez"), axis=axis_normal)
 
         # normal and tangential fields
         D_normal = derivative_info.D_der_map[fld_normal].sel(f=derivative_info.frequency)
@@ -2499,7 +2500,7 @@ def _derivative_face(
 
         # normal and tangential bounds
         bounds_T = np.array(derivative_info.bounds).T  # put (xyz) first dimension
-        bounds_normal, bounds_perp = self.pop_axis(bounds_T, axis=axis_normal, transpose=transpose)
+        bounds_normal, bounds_perp = self.pop_axis(bounds_T, axis=axis_normal)
 
         # define the integration plane
         coord_normal_face = bounds_normal[min_max_index]
@@ -2546,8 +2547,8 @@ def _derivative_face(
             eps_xyz_outside = [eps.isel(**{dim_normal: index_out}) for eps in eps_xyz]
 
         # put in normal / tangential basis
-        eps_in_normal, eps_in_perps = self.pop_axis(eps_xyz_inside, axis=axis_normal, transpose=transpose)
-        eps_out_normal, eps_out_perps = self.pop_axis(eps_xyz_outside, axis=axis_normal, transpose=transpose)
+        eps_in_normal, eps_in_perps = self.pop_axis(eps_xyz_inside, axis=axis_normal)
+        eps_out_normal, eps_out_perps = self.pop_axis(eps_xyz_outside, axis=axis_normal)
 
         # compute integration pre-factors
         delta_eps_perps = [eps_in - eps_out for eps_in, eps_out in zip(eps_in_perps, eps_out_perps)]

tidy3d/components/geometry/primitives.py

@@ -112,7 +112,11 @@ def intersections_tilted_plane(
         return [shapely.Polygon(vertices[:, :2])]
 
     def intersections_plane(
-        self, x: Optional[float] = None, y: Optional[float] = None, z: Optional[float] = None
+        self,
+        x: Optional[float] = None,
+        y: Optional[float] = None,
+        z: Optional[float] = None,
+        transpose: bool = False,
     ):
         """Returns shapely geometry at plane specified by one non None value of x,y,z.
 
@@ -135,7 +139,7 @@ def intersections_plane(
         axis, position = self.parse_xyz_kwargs(x=x, y=y, z=z)
         if not self.intersects_axis_position(axis, position):
             return []
-        z0, (x0, y0) = self.pop_axis(self.center, axis=axis)
+        z0, (x0, y0) = self.pop_axis(self.center, axis=axis, transpose=transpose)
         intersect_dist = self._intersect_dist(position, z0)
         if not intersect_dist:
             return []

tidy3d/components/grid/corner_finder.py

@@ -85,7 +85,6 @@ def _merged_pec_on_plane(
         structure_list: list[Structure],
         center: tuple[float, float] = [0, 0, 0],
         size: tuple[float, float, float] = [inf, inf, inf],
-        transpose: bool = False,
     ) -> list[tuple[Any, Shapely]]:
         """On a 2D plane specified by axis = `normal_axis` and coordinate `coord`, merge geometries made of PEC.
 
@@ -124,7 +123,7 @@ def _merged_pec_on_plane(
             PEC if (mat.is_pec or isinstance(mat, LossyMetalMedium)) else mat for mat in medium_list
         ]
         # merge geometries
-        merged_geos = merging_geometries_on_plane(geometry_list, plane, medium_list, transpose=transpose)
+        merged_geos = merging_geometries_on_plane(geometry_list, plane, medium_list)
 
         return merged_geos
 
@@ -134,7 +133,6 @@ def _corners_and_convexity(
         coord: float,
         structure_list: list[Structure],
         ravel: bool,
-        transpose: bool = False,
     ) -> tuple[ArrayFloat2D, ArrayFloat1D]:
         """On a 2D plane specified by axis = `normal_axis` and coordinate `coord`, find out corners of merged
         geometries made of PEC.
@@ -159,7 +157,7 @@ def _corners_and_convexity(
 
         # merge geometries
         merged_geos = self._merged_pec_on_plane(
-            normal_axis=normal_axis, coord=coord, structure_list=structure_list, transpose=transpose
+            normal_axis=normal_axis, coord=coord, structure_list=structure_list
         )
 
         # corner finder
@@ -197,7 +195,6 @@ def corners(
         normal_axis: Axis,
         coord: float,
         structure_list: list[Structure],
-        transpose: bool = False,
     ) -> ArrayFloat2D:
         """On a 2D plane specified by axis = `normal_axis` and coordinate `coord`, find out corners of merged
         geometries made of `medium`.
@@ -219,7 +216,7 @@ def corners(
         """
 
         corner_list, _ = self._corners_and_convexity(
-            normal_axis=normal_axis, coord=coord, structure_list=structure_list, ravel=True, transpose=transpose
+            normal_axis=normal_axis, coord=coord, structure_list=structure_list, ravel=True
         )
         return corner_list