ubcpdk 2.3.4__tar.gz → 2.3.5__tar.gz

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ubcpdk
-Version: 2.3.4
+Version: 2.3.5
 Summary: ubcpdk pdk
 Keywords: python
 Author-email: gdsfactory <contact@gdsfactory.com>
@@ -10,8 +10,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
-Requires-Dist: gdsfactory[cad]==7.8.18
-Requires-Dist: gplugins[tidy3d,sax,schematic]>=0.8.4,<0.9.0
+Requires-Dist: gdsfactory==7.13.0
+Requires-Dist: gplugins[tidy3d,sax,schematic]>=0.9.13,<0.10
 Requires-Dist: pytest ; extra == "dev"
 Requires-Dist: pytest-cov ; extra == "dev"
 Requires-Dist: pytest_regressions ; extra == "dev"
@@ -22,7 +22,7 @@ Requires-Dist: jupyter-book==0.15.1 ; extra == "docs"
 Provides-Extra: dev
 Provides-Extra: docs
 
-# ubcpdk (SiEPIC Ebeam PDK) 2.3.4
+# ubcpdk (SiEPIC Ebeam PDK) 2.3.5
 
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/gdsfactory/binder-sandbox/HEAD)
 [![pypi](https://img.shields.io/pypi/v/ubcpdk)](https://pypi.org/project/ubcpdk/)

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/README.md

@@ -1,4 +1,4 @@
-# ubcpdk (SiEPIC Ebeam PDK) 2.3.4
+# ubcpdk (SiEPIC Ebeam PDK) 2.3.5
 
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/gdsfactory/binder-sandbox/HEAD)
 [![pypi](https://img.shields.io/pypi/v/ubcpdk)](https://pypi.org/project/ubcpdk/)

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/pyproject.toml

@@ -15,8 +15,8 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory[cad]==7.8.18",
-  "gplugins[tidy3d,sax,schematic]>=0.8.4,<0.9.0"
+  "gdsfactory==7.13.0",
+  "gplugins[tidy3d,sax,schematic]>=0.9.13,<0.10"
 ]
 description = "ubcpdk pdk"
 keywords = ["python"]
@@ -24,7 +24,7 @@ license = {file = "LICENSE"}
 name = "ubcpdk"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "2.3.4"
+version = "2.3.5"
 
 [project.optional-dependencies]
 dev = [
@@ -39,26 +39,6 @@ docs = [
   "jupyter-book==0.15.1"
 ]
 
-[tool.black]
-exclude = '''  # Specify the files/dirs that should be ignored by the black formatter
-/(
-    \.eggs
-  | \.git
-  | \.hg
-  | \.mypy_cache
-  | \.tox
-  | \.venv
-  | env
-  | _build
-  | buck-out
-  | build
-  | dist
-)/
-'''
-include = '\.pyi?$'
-line-length = 88
-target-version = ['py310']
-
 [tool.mypy]
 python_version = "3.10"
 strict = true
@@ -147,7 +127,7 @@ message_template = "Bump to {new_version}"
 tag_template = "v{new_version}"
 
 [tool.tbump.version]
-current = "2.3.4"
+current = "2.3.5"
 regex = '''
   (?P<major>\d+)
   \.

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/ubcpdk/__init__.py

@@ -11,7 +11,7 @@ from ubcpdk import components, data, tech
 from ubcpdk.config import CONFIG, PATH, module
 from ubcpdk.tech import LAYER, LAYER_STACK, LAYER_VIEWS, cross_sections
 
-__version__ = "2.3.4"
+__version__ = "2.3.5"
 
 __all__ = [
     "CONFIG",

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/ubcpdk/components.py

@@ -260,7 +260,7 @@ def photonic_wirebond_surfacetaper_1550() -> gf.Component:
 def gc_te1310() -> gf.Component:
     """Return ebeam_gc_te1310 fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_te1310.gds", info=info1310te)
+    gc = import_gc("ebeam_gc_te1310.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -272,6 +272,7 @@ def gc_te1310() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1310te)
     return c
 
 
@@ -279,7 +280,7 @@ def gc_te1310() -> gf.Component:
 def gc_te1310_8deg() -> gf.Component:
     """Return ebeam_gc_te1310_8deg fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_te1310_8deg.gds", info=info1310te)
+    gc = import_gc("ebeam_gc_te1310_8deg.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -291,6 +292,7 @@ def gc_te1310_8deg() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1310te)
     return c
 
 
@@ -298,7 +300,7 @@ def gc_te1310_8deg() -> gf.Component:
 def gc_te1310_broadband() -> gf.Component:
     """Return ebeam_gc_te1310_broadband fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_te1310_broadband.gds", info=info1310te)
+    gc = import_gc("ebeam_gc_te1310_broadband.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -310,6 +312,7 @@ def gc_te1310_broadband() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1310te)
     return c
 
 
@@ -317,7 +320,7 @@ def gc_te1310_broadband() -> gf.Component:
 def gc_te1550() -> gf.Component:
     """Return ebeam_gc_te1550 fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_te1550.gds", info=info1550te)
+    gc = import_gc("ebeam_gc_te1550.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -329,6 +332,7 @@ def gc_te1550() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1550te)
     return c
 
 
@@ -336,7 +340,7 @@ def gc_te1550() -> gf.Component:
 def gc_te1550_90nmSlab() -> gf.Component:
     """Return ebeam_gc_te1550_90nmSlab fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_te1550_90nmSlab.gds", info=info1550te)
+    gc = import_gc("ebeam_gc_te1550_90nmSlab.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -348,6 +352,7 @@ def gc_te1550_90nmSlab() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1550te)
     return c
 
 
@@ -355,7 +360,7 @@ def gc_te1550_90nmSlab() -> gf.Component:
 def gc_te1550_broadband() -> gf.Component:
     """Return ebeam_gc_te1550_broadband fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_te1550_broadband.gds", info=info1550te)
+    gc = import_gc("ebeam_gc_te1550_broadband.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -367,6 +372,7 @@ def gc_te1550_broadband() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1550te)
     return c
 
 
@@ -374,7 +380,7 @@ def gc_te1550_broadband() -> gf.Component:
 def gc_tm1550() -> gf.Component:
     """Return ebeam_gc_tm1550 fixed cell."""
     c = gf.Component()
-    gc = import_gc("ebeam_gc_tm1550.gds", info=info1550tm)
+    gc = import_gc("ebeam_gc_tm1550.gds")
     gc_ref = c << gc
     c.add_ports(gc_ref.ports)
     c.copy_child_info(gc)
@@ -386,6 +392,7 @@ def gc_tm1550() -> gf.Component:
         layer=(1, 0),
         width=9,
     )
+    c.info.update(info1550tm)
     return c
 
 
@@ -494,6 +501,7 @@ def add_fiber_array(
     cross_section: CrossSectionSpec = "xs_sc",
     layer_label: LayerSpec = LAYER.TEXT,
     straight: ComponentSpec = straight,
+    post_process: Callable | None = None,
     **kwargs,
 ) -> Component:
     """Returns component with grating couplers and labels on each port.
@@ -512,6 +520,8 @@ def add_fiber_array(
         grating_coupler: grating coupler instance, function or list of functions.
         cross_section: spec.
         layer_label: for label.
+        straight: straight component.
+        post_process: function to post process the component.
 
     """
     c = gf.Component()
@@ -536,6 +546,8 @@ def add_fiber_array(
     ref.rotate(-90)
     c.add_ports(ref.ports)
     c.copy_child_info(component)
+    if post_process:
+        c = post_process(c)
     return c
 
 
@@ -624,7 +636,6 @@ def dbr(
         l1=l1,
         l2=l2,
         cross_section=xs,
-        decorator=None,
     )
     dbr = c << _dbr
     s.connect("o2", dbr.ports["o1"])
@@ -635,18 +646,17 @@ def dbr(
 coupler = partial(
     gf.components.coupler,
     cross_section=tech.xs_sc_simple,
-    decorator=tech.add_pins_bbox_siepic,
+    post_process=tech.add_pins_bbox_siepic,
 )
 coupler_ring = partial(
     gf.components.coupler_ring,
     cross_section=tech.xs_sc_simple,
     add_bbox=tech.add_pins_bbox_siepic,
-    # decorator=tech.add_pins_bbox_siepic,
 )
 mmi1x2 = partial(
     gf.components.mmi1x2,
     cross_section=tech.xs_sc_simple,
-    decorator=tech.add_pins_bbox_siepic,
+    post_process=tech.add_pins_bbox_siepic,
 )
 
 
@@ -704,23 +714,13 @@ def ebeam_dc_halfring_straight(
 
     if siepic:
         x = tech.xs_sc_simple
-        c.info.update(
-            layout_model_port_pairs=(
-                ("o1", "port 1"),
-                ("o2", "port 2"),
-                ("o3", "port 4"),
-                ("o4", "port 3"),
-            ),
-            properties={
-                "gap": gap * um,
-                "radius": radius * um,
-                "wg_thickness": thickness[LAYER.WG] * um,
-                "wg_width": x.width * um,
-                "Lc": length_x * um,
-            },
-            component_type=["optical"],
-            model=model,
-        )
+        c.info["model"] = model
+        c.info["gap"] = gap
+        c.info["radius"] = radius
+        c.info["wg_thickness"] = thickness[LAYER.WG]
+        c.info["wg_width"] = x.width
+        c.info["Lc"] = length_x
+
     return c
 
 
@@ -756,7 +756,7 @@ ring_single_heater = partial(
 
 
 ebeam_dc_te1550 = partial(
-    gf.components.coupler, decorator=add_pins_bbox_siepic_remove_layers
+    gf.components.coupler, post_process=add_pins_bbox_siepic_remove_layers
 )
 taper = partial(gf.components.taper)
 spiral = partial(gf.components.spiral_external_io)
@@ -777,7 +777,7 @@ pad = partial(
     layer=LAYER.M2_ROUTER,
     bbox_layers=(LAYER.PAD_OPEN,),
     bbox_offsets=(-1.8,),
-    decorator=add_pins_siepic_metal,
+    post_process=add_pins_siepic_metal,
 )
 
 
@@ -830,7 +830,7 @@ def add_fiber_array_pads_rf(
         add_label, gf.port.auto_rename_ports_electrical
     )
     c1 = add_pads_rf(
-        component=c0, decorator=rename_ports_and_add_label, orientation=orientation
+        component=c0, post_process=rename_ports_and_add_label, orientation=orientation
     )
     return add_fiber_array(component=c1, **kwargs)
 
@@ -851,10 +851,15 @@ def add_pads(
     c0 = gf.get_component(component)
     text = f"elec_{username}-{clean_name(c0.name)}_G"
     add_label = partial(add_label_electrical, text=text)
-    return add_pads_rf(component=c0, decorator=add_label, **kwargs)
+    return add_pads_rf(component=c, post_process=add_label, **kwargs)
 
 
 if __name__ == "__main__":
+    import ubcpdk.components as uc
+
+    c = uc.ring_single_heater()
+    c = uc.add_fiber_array_pads_rf(c)
+
     # c = ring_double(length_y=10)
     # c = ring_with_crossing()
     # c = mmi1x2()
@@ -869,7 +874,8 @@ if __name__ == "__main__":
     # c = spiral()
     # c = mzi_heater()
     # c = ring_double_heater()
-    c = ring_single_heater()
+    # c = ring_single_heater()
+    # c = gc_te1310()
     # c = ebeam_dc_halfring_straight()
     # c = ring_with_crossing()
     # c = ring_single()

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/ubcpdk/import_gds.py

@@ -173,13 +173,16 @@ def import_gds(gdspath, **kwargs):
         gdsdir=PATH.gds,
         library="Design kits/ebeam",
         model=gdspath.split(".")[0],
-        decorator=add_ports_from_siepic_pins,
+        post_process=add_ports_from_siepic_pins,
         **kwargs,
     )
 
 
-def import_gc(gdspath, **kwargs):
+def import_gc(gdspath, info=None, **kwargs):
     c = import_gds(gdspath, **kwargs)
+
+    if info is not None:
+        c.info.update(info)
     return gf.functions.mirror(component=c)
 
 

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/ubcpdk/klayout/tech/pymacros/set_menus.lym

@@ -17,7 +17,7 @@
  <text>
 import pya
 
-__version__ = "2.3.4"
+__version__ = "2.3.5"
 
 
 def set_menu():

{ubcpdk-2.3.4 → ubcpdk-2.3.5}/ubcpdk/tech.py

@@ -292,19 +292,19 @@ cladding_offsets_optical_siepic = None
 ############################
 # Cross-sections functions
 ############################
-
-strip = partial(
+cross_section = partial(
     gf.cross_section.cross_section,
     add_pins_function_name="add_pins_siepic",
     add_pins_function_module="ubcpdk.tech",
+    radius_min=5,
+)
+
+strip = partial(
+    cross_section,
     cladding_layers=cladding_layers_optical_siepic,
     cladding_offsets=cladding_offsets_optical_siepic,
 )
-strip_unclad = partial(
-    gf.cross_section.cross_section,
-    add_pins_function_name="add_pins_siepic",
-    add_pins_function_module="ubcpdk.tech",
-)
+strip_unclad = strip_simple = cross_section
 strip_heater_metal = partial(
     gf.cross_section.strip_heater_metal,
     layer="WG",
@@ -316,24 +316,19 @@ strip_heater_metal = partial(
     add_pins_function_module="ubcpdk.tech",
 )
 
-strip_simple = gf.cross_section.cross_section
 strip_bbox = partial(
-    gf.cross_section.cross_section,
+    cross_section,
     bbox_layers=cladding_layers_optical_siepic,
     bbox_offsets=cladding_offsets_optical_siepic,
-    add_pins_function_name="add_pins_siepic",
-    add_pins_function_module="ubcpdk.tech",
 )
 
 metal_routing = partial(
-    gf.cross_section.cross_section,
+    cross_section,
     layer=LAYER.M2_ROUTER,
     width=10.0,
     port_names=gf.cross_section.port_names_electrical,
     port_types=gf.cross_section.port_types_electrical,
     radius=None,
-    add_pins_function_name="add_pins_siepic_metal",
-    add_pins_function_module="ubcpdk.tech",
 )
 heater_metal = partial(
     metal_routing, width=4, layer=LAYER.M1_HEATER, add_pins_function_name=None