Merge pull request #178 from gdsfactory/simpler_containers

simpler containers

Author: joamatab

cspdk/si220/cband/cells/containers.py

@@ -1,18 +1,18 @@
 """This module contains cells that contain other cells."""
 
-from typing import Any
-
 import gdsfactory as gf
 from gdsfactory.component import Component
 from gdsfactory.typings import (
-    CellSpec,
     ComponentSpec,
     CrossSectionSpec,
     Strs,
 )
 
 gc = "grating_coupler_elliptical"
 
+pack_doe = gf.c.pack_doe
+pack_doe_grid = gf.c.pack_doe_grid
+
 
 @gf.cell
 def add_fiber_array(
@@ -183,7 +183,7 @@ def add_pads_top(
     port_type: str = "electrical",
     allow_width_mismatch: bool = True,
     fanout_length: float | None = 80,
-    route_width: float | list[float] | None = 0,
+    route_width: float | list[float] = 0,
     **kwargs,
 ) -> Component:
     """Returns new component with ports connected top pads.
@@ -239,90 +239,3 @@ def add_pads_top(
         route_width=route_width,
         **kwargs,
     )
-
-
-@gf.cell
-def pack_doe(
-    doe: ComponentSpec,
-    settings: dict[str, tuple[Any, ...]],
-    do_permutations: bool = False,
-    function: CellSpec | None = None,
-    **kwargs,
-) -> Component:
-    """Packs a component DOE (Design of Experiment) using pack.
-
-    Args:
-        doe: function to return Components.
-        settings: component settings.
-        do_permutations: for each setting.
-        function: to apply (add padding, grating couplers).
-        kwargs: for pack.
-
-    Keyword Args:
-        spacing: Minimum distance between adjacent shapes.
-        aspect_ratio: (width, height) ratio of the rectangular bin.
-        max_size: Limits the size into which the shapes will be packed.
-        sort_by_area: Pre-sorts the shapes by area.
-        density: Values closer to 1 pack tighter but require more computation.
-        precision: Desired precision for rounding vertex coordinates.
-        text: Optional function to add text labels.
-        text_prefix: for labels. For example. 'A' for 'A1', 'A2'...
-        text_offsets: relative to component size info anchor. Defaults to center.
-        text_anchors: relative to component (ce cw nc ne nw sc se sw center cc).
-        name_prefix: for each packed component (avoids the Unnamed cells warning).
-            Note that the suffix contains a uuid so the name will not be deterministic.
-        rotation: for each component in degrees.
-        h_mirror: horizontal mirror in y axis (x, 1) (1, 0). This is the most common.
-        v_mirror: vertical mirror using x axis (1, y) (0, y).
-    """
-    return gf.components.pack_doe(
-        doe=doe,
-        settings=settings,
-        do_permutations=do_permutations,
-        function=function,
-        **kwargs,
-    )
-
-
-@gf.cell
-def pack_doe_grid(
-    doe: ComponentSpec,
-    settings: dict[str, tuple[Any, ...]],
-    do_permutations: bool = False,
-    function: CellSpec | None = None,
-    with_text: bool = False,
-    **kwargs,
-) -> Component:
-    """Packs a component DOE (Design of Experiment) using grid.
-
-    Args:
-        doe: function to return Components.
-        settings: component settings.
-        do_permutations: for each setting.
-        function: to apply to component (add padding, grating couplers).
-        with_text: includes text label.
-        kwargs: for grid.
-
-    Keyword Args:
-        spacing: between adjacent elements on the grid, can be a tuple for
-            different distances in height and width.
-        separation: If True, guarantees elements are separated with fixed spacing
-            if False, elements are spaced evenly along a grid.
-        shape: x, y shape of the grid (see np.reshape).
-            If no shape and the list is 1D, if np.reshape were run with (1, -1).
-        align_x: {'x', 'xmin', 'xmax'} for x (column) alignment along.
-        align_y: {'y', 'ymin', 'ymax'} for y (row) alignment along.
-        edge_x: {'x', 'xmin', 'xmax'} for x (column) (ignored if separation = True).
-        edge_y: {'y', 'ymin', 'ymax'} for y (row) (ignored if separation = True).
-        rotation: for each component in degrees.
-        h_mirror: horizontal mirror y axis (x, 1) (1, 0). most common mirror.
-        v_mirror: vertical mirror using x axis (1, y) (0, y).
-    """
-    return gf.components.pack_doe_grid(
-        doe=doe,
-        settings=settings,
-        do_permutations=do_permutations,
-        function=function,
-        with_text=with_text,
-        **kwargs,
-    )