Merge pull request #43 from gdsfactory/1510

1510
gdsfactory · May 20, 2022 · bbb4734 · bbb4734
2 parents 466a932 + 6da97ec
commit bbb4734
Show file tree

Hide file tree

Showing 10 changed files with 576 additions and 9 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 lygadgets==0.1.31
-gdsfactory[full]==5.6.6
+gdsfactory[full]==5.7.1
 modes==1.0.6
diff --git a/ubcpdk/circuits/mzi_lattice.pic.yml → ubcpdk/circuits/mzi_lattice_filter.pic.yml b/ubcpdk/circuits/mzi_lattice.pic.yml → ubcpdk/circuits/mzi_lattice_filter.pic.yml
@@ -1,16 +1,16 @@
 name: mzi_lattice
 pdk: ubcpdk
-
 instances:
   mzi1:
     component: mzi_ubcpdk
     settings:
-      dy: -300
+      dy: -200
 
   mzi2:
     component: mzi_ubcpdk
     settings:
-      dy: -50
+      dy: -55
+
 
   gc1:
     component: gc_te1550
@@ -34,7 +34,6 @@ placements:
     xmin: mzi2,east
     dx: 100
 
-
 routes:
   optical:
     links:

diff --git a/ubcpdk/config.py b/ubcpdk/config.py
@@ -62,6 +62,7 @@ class Path:
     ring_tm_r30_g250 = ring / "LukasC_RingDoubleTMR30g250_1490.mat"
     dbr = data / "bragg"
     lyp = module / "klayout" / "tech" / "layers.lyp"
+    lyt = module / "klayout" / "tech" / "tech.lyt"
     tech = module / "klayout" / "tech"
 
 

diff --git a/ubcpdk/tests/test_components.gds/gds_ref/mask_compact_f5aba6e9.gds b/ubcpdk/tests/test_components.gds/gds_ref/mask_compact_f5aba6e9.gds
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/mzi_lattice_f0e0b81e.gds b/ubcpdk/tests/test_components.gds/gds_ref/mzi_lattice_f0e0b81e.gds
diff --git a/ubcpdk/tests/test_components.gds/gds_ref/mzi_ubcpdk_039291ce.gds b/ubcpdk/tests/test_components.gds/gds_ref/mzi_ubcpdk_039291ce.gds
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_mask_.yml b/ubcpdk/tests/test_components/test_pdk_settings_mask_.yml
@@ -1,3 +1,192 @@
-name: mask_compact
-settings: {}
+name: mask_compact_f5aba6e9
+settings:
+  changed:
+    conf:
+      instances:
+        mzis:
+          component: pack_doe_grid
+          settings:
+            do_permutations: true
+            doe: mzi
+            function: add_fiber_array
+            settings:
+              delta_length:
+              - 10
+              - 100
+            spacing:
+            - 10
+            - 10
+        rings:
+          component: pack_doe
+          settings:
+            do_permutations: true
+            doe: ring_single
+            function:
+              function: add_fiber_array
+              settings:
+                fanout_length: 200
+            settings:
+              length_x:
+              - 1
+              - 2
+              - 3
+              radius:
+              - 30
+              - 50
+              - 20
+              - 40
+      name: mask_compact
+      pdk: ubcpdk
+      placements:
+        mzis:
+          xmin: rings,east
+        rings:
+          xmin: 50
+  child: null
+  default:
+    label_instance_function:
+      function: add_instance_label
+    routing_strategy:
+      get_bundle:
+        function: get_bundle
+      get_bundle_electrical:
+        function: get_bundle
+        settings:
+          bend:
+            function: wire_corner
+          cross_section:
+            function: cross_section
+            settings:
+              layer:
+              - 49
+              - 0
+              port_names:
+              - e1
+              - e2
+              port_types:
+              - electrical
+              - electrical
+              width: 10
+      get_bundle_from_steps:
+        function: get_bundle_from_steps
+      get_bundle_from_steps_electrical:
+        function: get_bundle_from_steps
+        settings:
+          bend:
+            function: wire_corner
+          cross_section:
+            function: cross_section
+            settings:
+              layer:
+              - 49
+              - 0
+              port_names:
+              - e1
+              - e2
+              port_types:
+              - electrical
+              - electrical
+              width: 10
+      get_bundle_from_waypoints:
+        function: get_bundle_from_waypoints
+      get_bundle_path_length_match:
+        function: get_bundle_path_length_match
+      get_bundle_same_axis_no_grouping:
+        function: get_bundle_same_axis_no_grouping
+  full:
+    conf:
+      instances:
+        mzis:
+          component: pack_doe_grid
+          settings:
+            do_permutations: true
+            doe: mzi
+            function: add_fiber_array
+            settings:
+              delta_length:
+              - 10
+              - 100
+            spacing:
+            - 10
+            - 10
+        rings:
+          component: pack_doe
+          settings:
+            do_permutations: true
+            doe: ring_single
+            function:
+              function: add_fiber_array
+              settings:
+                fanout_length: 200
+            settings:
+              length_x:
+              - 1
+              - 2
+              - 3
+              radius:
+              - 30
+              - 50
+              - 20
+              - 40
+      name: mask_compact
+      pdk: ubcpdk
+      placements:
+        mzis:
+          xmin: rings,east
+        rings:
+          xmin: 50
+    label_instance_function:
+      function: add_instance_label
+    routing_strategy:
+      get_bundle:
+        function: get_bundle
+      get_bundle_electrical:
+        function: get_bundle
+        settings:
+          bend:
+            function: wire_corner
+          cross_section:
+            function: cross_section
+            settings:
+              layer:
+              - 49
+              - 0
+              port_names:
+              - e1
+              - e2
+              port_types:
+              - electrical
+              - electrical
+              width: 10
+      get_bundle_from_steps:
+        function: get_bundle_from_steps
+      get_bundle_from_steps_electrical:
+        function: get_bundle_from_steps
+        settings:
+          bend:
+            function: wire_corner
+          cross_section:
+            function: cross_section
+            settings:
+              layer:
+              - 49
+              - 0
+              port_names:
+              - e1
+              - e2
+              port_types:
+              - electrical
+              - electrical
+              width: 10
+      get_bundle_from_waypoints:
+        function: get_bundle_from_waypoints
+      get_bundle_path_length_match:
+        function: get_bundle_path_length_match
+      get_bundle_same_axis_no_grouping:
+        function: get_bundle_same_axis_no_grouping
+  function_name: _from_yaml
+  info: {}
+  info_version: 2
+  module: gdsfactory.read.from_yaml
+  name: mask_compact_f5aba6e9
 version: 0.0.1
diff --git a/ubcpdk/tests/test_components/test_pdk_settings_mzi_.yml b/ubcpdk/tests/test_components/test_pdk_settings_mzi_.yml
@@ -61,6 +61,8 @@ settings:
     cross_section:
       function: cross_section
       settings: {}
+    cross_section_x_bot: null
+    cross_section_x_top: null
     delta_length: 10
     length_x: 0.1
     length_y: 2
@@ -91,6 +93,8 @@ settings:
             library: Design Kits/ebeam
     combiner: null
     cross_section: strip
+    cross_section_x_bot: null
+    cross_section_x_top: null
     delta_length: 10
     length_x: 0.1
     length_y: 2