Revert "reformatting some files manually. afraid to use "black""

This reverts commit fd86c99.

Author: jewettaijfc

tests/test_components/test_geometry.py

@@ -767,25 +767,27 @@ def test_geometry_touching_intersections_plane(x0):
 
 
 def test_pop_axis():
+    b = td.Box(size=(1, 1, 1))
     for axis in range(3):
         coords = (1, 2, 3)
-        Lz, (Lx, Ly) = td.Box.pop_axis(coords, axis=axis)
-        _coords = td.Box.unpop_axis(Lz, (Lx, Ly), axis=axis)
+        Lz, (Lx, Ly) = b.pop_axis(coords, axis=axis)
+        _coords = b.unpop_axis(Lz, (Lx, Ly), axis=axis)
         assert all(c == _c for (c, _c) in zip(coords, _coords))
-        _Lz, (_Lx, _Ly) = td.Box.pop_axis(_coords, axis=axis)
+        _Lz, (_Lx, _Ly) = b.pop_axis(_coords, axis=axis)
         assert Lz == _Lz
         assert Lx == _Lx
         assert Ly == _Ly
 
 
 @pytest.mark.parametrize("transpose", [True, False])
 def test_pop_axis_and_swap(transpose):
+    b = td.Box(size=(1, 1, 1))
     for axis in range(3):
         coords = (1, 2, 3)
-        Lz, (Lx, Ly) = td.Box.pop_axis_and_swap(coords, axis=axis, transpose=transpose)
-        _coords = td.Box.unpop_axis_and_swap(Lz, (Lx, Ly), axis=axis, transpose=transpose)
+        Lz, (Lx, Ly) = b.pop_axis_and_swap(coords, axis=axis, transpose=transpose)
+        _coords = b.unpop_axis_and_swap(Lz, (Lx, Ly), axis=axis, transpose=transpose)
         assert all(c == _c for (c, _c) in zip(coords, _coords))
-        _Lz, (_Lx, _Ly) = td.Box.pop_axis_and_swap(_coords, axis=axis, transpose=transpose)
+        _Lz, (_Lx, _Ly) = b.pop_axis_and_swap(_coords, axis=axis, transpose=transpose)
         assert Lz == _Lz
         assert Lx == _Lx
         assert Ly == _Ly

tidy3d/components/geometry/base.py

@@ -236,7 +236,7 @@ def intersections_tilted_plane(
         """
 
     def intersections_plane(
-        self,
+        self, 
         x: Optional[float] = None,
         y: Optional[float] = None,
         z: Optional[float] = None,
@@ -453,7 +453,9 @@ def zero_dims(self) -> list[Axis]:
         return zero_dims
 
     def _pop_bounds(
-        self, axis: Axis, transpose: bool = False
+        self,
+        axis: Axis,
+        transpose: bool = False
     ) -> tuple[Coordinate2D, tuple[Coordinate2D, Coordinate2D]]:
         """Returns min and max bounds in plane normal to and tangential to ``axis``.
 
@@ -561,9 +563,7 @@ def plot(
         ax = self.add_ax_lims(axis=axis, ax=ax, transpose=transpose)
         ax.set_aspect("equal")
         # Add the default axis labels, tick labels, and title
-        ax = Box.add_ax_labels_and_title(
-            ax=ax, x=x, y=y, z=z, plot_length_units=plot_length_units, transpose=transpose
-        )
+        ax = Box.add_ax_labels_and_title(ax=ax, x=x, y=y, z=z, plot_length_units=plot_length_units, transpose=transpose)
         return ax
 
     def plot_shape(self, shape: Shapely, plot_params: PlotParams, ax: Ax) -> Ax:
@@ -649,9 +649,7 @@ def _get_plot_limits(
         _, ((xmin, ymin), (xmax, ymax)) = self._pop_bounds(axis=axis, transpose=transpose)
         return (xmin - buffer, xmax + buffer), (ymin - buffer, ymax + buffer)
 
-    def add_ax_lims(
-        self, axis: Axis, ax: Ax, buffer: float = PLOT_BUFFER, transpose: bool = False
-    ) -> Ax:
+    def add_ax_lims(self, axis: Axis, ax: Ax, buffer: float = PLOT_BUFFER, transpose: bool = False) -> Ax:
         """Sets the horizontal and vertical axis limits based on ``self.bounds``.
 
         Parameters
@@ -670,9 +668,7 @@ def add_ax_lims(
         matplotlib.axes._subplots.Axes
             The supplied or created matplotlib axes.
         """
-        (xmin, xmax), (ymin, ymax) = self._get_plot_limits(
-            axis=axis, buffer=buffer, transpose=transpose
-        )
+        (xmin, xmax), (ymin, ymax) = self._get_plot_limits(axis=axis, buffer=buffer, transpose=transpose)
 
         # note: axes limits dont like inf values, so we need to evaluate them first if present
         xmin, xmax, ymin, ymax = self._evaluate_inf((xmin, xmax, ymin, ymax))
@@ -767,6 +763,7 @@ def pop_axis(
         axis : int
             Integer index into 'xyz' (0,1,2).
 
+
         Returns
         -------
         Any, Tuple[Any, Any]
@@ -797,8 +794,8 @@ def pop_axis_and_swap(
             Tuple of three values in original coordinate system.
         axis : int
             Integer index into 'xyz' (0,1,2).
-        transpose : bool = False
-            Optional: Swap the order of the data from the two remaining axes in the output tuple.
+        transpose: bool = False
+            Optional: Swap the order of the data from the two remaining axes in the output tuple?
 
         Returns
         -------
@@ -865,7 +862,7 @@ def unpop_axis_and_swap(
         axis : int
             Integer index into 'xyz' (0,1,2).
         transpose: bool = False
-            Optional: Swap the order of the entries in plane_coords[].
+            Optional: Swap the order of the entries in plane_coords[]?
 
         Returns
         -------
@@ -1682,7 +1679,7 @@ def intersections_tilted_plane(
             axis = np.argmax(np.abs(normal)).item()
             coord = "xyz"[axis]
             kwargs = {coord: origin[axis]}
-            section = self.intersections_plane(**kwargs)
+            section = self.intersections_plane(**kwargs)  # <-- BUG?: X,Y axis order ignores normal axis direction +/-
             # Apply transformation in the plane by removing row and column
             to_2D_in_plane = np.delete(np.delete(to_2D, 2, 0), axis, 1)
 
@@ -1869,7 +1866,11 @@ def _order_axis(self, axis: int) -> int:
         return axis_index[axis]
 
     def _order_by_axis(
-        self, plane_val: Any, axis_val: Any, axis: int, transpose: bool = False
+        self,
+        plane_val: Any,
+        axis_val: Any,
+        axis: int,
+        transpose: bool = False
     ) -> tuple[Any, Any]:
         """Orders a value in the plane and value along axis in correct (x,y) order for plotting.
            Note: sometimes if axis=1 and we compute cross section values orthogonal to axis,
@@ -2159,9 +2160,9 @@ def _do_intersections_tilted_plane(
         return path.polygons_full
 
     def intersections_plane(
-        self,
-        x: Optional[float] = None,
-        y: Optional[float] = None,
+        self, 
+        x: Optional[float] = None, 
+        y: Optional[float] = None, 
         z: Optional[float] = None,
         transpose: bool = False,
     ):
@@ -2264,10 +2265,7 @@ def intersections_with(self, other, transpose: bool = False):
         shapes_plane = other.intersections_plane(**xyz_kwargs, transpose=transpose)
 
         # intersect all shapes with the input self
-        bs_min, bs_max = (
-            self.pop_axis_and_swap(bounds, axis=normal_ind, transpose=transpose)[1]
-            for bounds in self.bounds
-        )
+        bs_min, bs_max = (self.pop_axis_and_swap(bounds, axis=normal_ind, transpose=transpose)[1] for bounds in self.bounds)
 
         shapely_box = self.make_shapely_box(bs_min[0], bs_min[1], bs_max[0], bs_max[1])
         shapely_box = Geometry.evaluate_inf_shape(shapely_box)
@@ -2362,8 +2360,7 @@ def _plot_arrow(
         arrow_base : :class:`.Coordinate` = None
             Custom base of the arrow. Uses the geometry's center if not provided.
         transpose : bool = False
-            Swap horizontal and vertical axes. (This overrides the default
-            lexicographic axis order.)
+            Swap horizontal and vertical axes. (This overrides the default lexicographic axis order.)
 
         Returns
         -------
@@ -2376,9 +2373,7 @@ def _plot_arrow(
 
         # conditions to check to determine whether to plot arrow, taking into account the
         # possibility of a custom arrow base
-        arrow_intersecting_plane = (
-            len(self.intersections_plane(x=x, y=y, z=z, transpose=transpose)) > 0
-        )
+        arrow_intersecting_plane = len(self.intersections_plane(x=x, y=y, z=z, transpose=transpose)) > 0
         center = self.center
         if arrow_base:
             arrow_intersecting_plane = arrow_intersecting_plane and any(