fix more tests

tests/test_components/test_pdk_settings_ring_double_heater_.yml

@@ -1,5 +1,5 @@
 info: {}
-name: ring_double_heater_G0p2_7039e197
+name: ring_double_heater_G0p2_2d50a6d4
 settings:
   bend: bend_euler
   coupler_ring: coupler_ring
@@ -11,7 +11,7 @@ settings:
   length_y: 0.2
   radius: 10
   straight: straight
-  via_stack: Fvia_stack_Mgdsfactorypcomponentspvia_stack_SS10_10_LM1_HEATER_M2_ROUTER_VNone_None
+  via_stack: via_stack_heater_mtop
   via_stack_offset:
   - 1
   - 0

tests/test_components/test_pdk_settings_ring_single_heater_.yml

@@ -1,5 +1,5 @@
 info: {}
-name: ring_double_heater_G0p2_9606c000
+name: ring_double_heater_G0p2_8e96fef6
 settings:
   bend: bend_euler
   coupler_ring: coupler_ring
@@ -11,7 +11,7 @@ settings:
   length_y: 0.01
   radius: 10
   straight: straight
-  via_stack: Fvia_stack_Mgdsfactorypcomponentspvia_stack_SS10_10_LM1_HEATER_M2_ROUTER_VNone_None
+  via_stack: via_stack_heater_mtop
   via_stack_offset:
   - 1
   - 0

tests/test_components/test_pdk_settings_straight_.yml

@@ -1,14 +1,12 @@
-function: straight
 info:
-  length: 1.0
-  route_info_length: 1.0
-  route_info_type: xs_sc
-  route_info_weight: 1.0
-  route_info_xs_sc_length: 1.0
+  length: 1
+  route_info_length: 1
+  route_info_type: xs_34e31a19
+  route_info_weight: 1
+  route_info_xs_34e31a19_length: 1
   width: 0.5
-module: ubcpdk.components
-name: straight__ubcpdkpcomponents
+name: straight_L1_N2_CSxs_sc
 settings:
   cross_section: xs_sc
-  length: 1.0
+  length: 1
   npoints: 2

tests/test_components/test_pdk_settings_via_stack_heater_mtop_.yml

@@ -1,17 +1,8 @@
 info:
   xsize: 10
   ysize: 10
-name: via_stack_S10_10_LM1_HE_f3e2bc80
+name: via_stack_heater_mtop_S10_10
 settings:
-  correct_size: true
-  layers:
-  - M1_HEATER
-  - M2_ROUTER
   size:
   - 10
   - 10
-  slot_horizontal: false
-  slot_vertical: false
-  vias:
-  - null
-  - null

tests/test_netlists.py

@@ -29,6 +29,7 @@
     "ebeam_BondPad",
     "add_fiber_array",
     "add_pads_top",
+    "add_pads_bot",
 }
 cell_names = cells.keys() - skip_test
 
@@ -67,7 +68,7 @@ def test_netlists(
 if __name__ == "__main__":
     component_type = "straight_heater_metal"
     component_type = "gc_te1310_broadband"
-    component_type = "ring_single"
+    component_type = "ring_double"
     connection_error_types = {
         "optical": ["width_mismatch", "shear_angle_mismatch", "orientation_mismatch"]
     }
@@ -80,6 +81,7 @@ def test_netlists(
     )
     yaml_str = OmegaConf.to_yaml(n, sort_keys=True)
     c1.delete()
+    gf.clear_cache()
     # print(yaml_str)
     c2 = gf.read.from_yaml(yaml_str)
     n2 = c2.get_netlist(allow_multiple=True)

tests/test_netlists/test_netlists_coupler_ring_.yml

@@ -1,23 +1,23 @@
 instances:
-  coupler90_G0p2_R5_Bbend_7f6b3237_-6625_2725:
+  coupler90_G0p2_R10_Bben_8e042ed7_-9375_5225:
     component: coupler90
     info: {}
     settings:
       bend: bend_euler
       cross_section: strip
       cross_section_bend: strip
       gap: 0.2
-      radius: 5
+      radius: 10
       straight: straight
-  coupler90_G0p2_R5_Bbend_7f6b3237_2625_2725:
+  coupler90_G0p2_R10_Bben_8e042ed7_5375_5225:
     component: coupler90
     info: {}
     settings:
       bend: bend_euler
       cross_section: strip
       cross_section_bend: strip
       gap: 0.2
-      radius: 5
+      radius: 10
       straight: straight
   coupler_straight_L4_G0p2_CSstrip_-2000_350:
     component: coupler_straight
@@ -26,7 +26,7 @@ instances:
       cross_section: strip
       gap: 0.2
       length: 4
-  straight_L3_N2_CSstrip_-10500_0:
+  straight_L3_N2_CSstrip_-15500_0:
     component: straight
     info:
       length: 3
@@ -39,7 +39,7 @@ instances:
       cross_section: strip
       length: 3
       npoints: 2
-  straight_L3_N2_CSstrip_6500_0:
+  straight_L3_N2_CSstrip_11500_0:
     component: straight
     info:
       length: 3
@@ -52,27 +52,27 @@ instances:
       cross_section: strip
       length: 3
       npoints: 2
-name: coupler_ring
+name: coupler_ring_G0p2_R10_L_4c94bf2e
 nets:
-- p1: coupler90_G0p2_R5_Bbend_7f6b3237_-6625_2725,o1
+- p1: coupler90_G0p2_R10_Bben_8e042ed7_-9375_5225,o1
   p2: coupler_straight_L4_G0p2_CSstrip_-2000_350,o1
-- p1: coupler90_G0p2_R5_Bbend_7f6b3237_-6625_2725,o2
+- p1: coupler90_G0p2_R10_Bben_8e042ed7_-9375_5225,o2
   p2: coupler_straight_L4_G0p2_CSstrip_-2000_350,o2
-- p1: coupler90_G0p2_R5_Bbend_7f6b3237_-6625_2725,o4
-  p2: straight_L3_N2_CSstrip_-10500_0,o2
-- p1: coupler90_G0p2_R5_Bbend_7f6b3237_2625_2725,o1
+- p1: coupler90_G0p2_R10_Bben_8e042ed7_-9375_5225,o4
+  p2: straight_L3_N2_CSstrip_-15500_0,o2
+- p1: coupler90_G0p2_R10_Bben_8e042ed7_5375_5225,o1
   p2: coupler_straight_L4_G0p2_CSstrip_-2000_350,o4
-- p1: coupler90_G0p2_R5_Bbend_7f6b3237_2625_2725,o2
+- p1: coupler90_G0p2_R10_Bben_8e042ed7_5375_5225,o2
   p2: coupler_straight_L4_G0p2_CSstrip_-2000_350,o3
-- p1: coupler90_G0p2_R5_Bbend_7f6b3237_2625_2725,o4
-  p2: straight_L3_N2_CSstrip_6500_0,o1
+- p1: coupler90_G0p2_R10_Bben_8e042ed7_5375_5225,o4
+  p2: straight_L3_N2_CSstrip_11500_0,o1
 placements:
-  coupler90_G0p2_R5_Bbend_7f6b3237_-6625_2725:
+  coupler90_G0p2_R10_Bben_8e042ed7_-9375_5225:
     mirror: true
     rotation: 180
     x: -4
     y: 0
-  coupler90_G0p2_R5_Bbend_7f6b3237_2625_2725:
+  coupler90_G0p2_R10_Bben_8e042ed7_5375_5225:
     mirror: false
     rotation: 0
     x: 0
@@ -82,18 +82,18 @@ placements:
     rotation: 0
     x: -4
     y: 0
-  straight_L3_N2_CSstrip_-10500_0:
+  straight_L3_N2_CSstrip_-15500_0:
     mirror: false
     rotation: 0
-    x: -12
+    x: -17
     y: 0
-  straight_L3_N2_CSstrip_6500_0:
+  straight_L3_N2_CSstrip_11500_0:
     mirror: false
     rotation: 0
-    x: 5
+    x: 10
     y: 0
 ports:
-  o1: straight_L3_N2_CSstrip_-10500_0,o1
-  o2: coupler90_G0p2_R5_Bbend_7f6b3237_-6625_2725,o3
-  o3: coupler90_G0p2_R5_Bbend_7f6b3237_2625_2725,o3
-  o4: straight_L3_N2_CSstrip_6500_0,o2
+  o1: straight_L3_N2_CSstrip_-15500_0,o1
+  o2: coupler90_G0p2_R10_Bben_8e042ed7_-9375_5225,o3
+  o3: coupler90_G0p2_R10_Bben_8e042ed7_5375_5225,o3
+  o4: straight_L3_N2_CSstrip_11500_0,o2

tests/test_netlists/test_netlists_ring_double_.yml

@@ -1,87 +1,87 @@
 instances:
-  coupler_ring_G0p2_R10_L_227a123a_-5_16185:
+  coupler_ring_G0p2_R10_L_9aa84a70_-2000_16775:
     component: coupler_ring
     info: {}
     settings:
       bend: bend_euler
       coupler90: coupler90
       coupler_straight: coupler_straight
-      cross_section: Fcross_section_Mgdsfactorypcross_section_SRM5_CLNone_CONone
+      cross_section: strip
       gap: 0.2
       length_extension: 3
-      length_x: 0.01
+      length_x: 4
       radius: 10
-  coupler_ring_G0p2_R10_L_227a123a_-5_5225:
+  coupler_ring_G0p2_R10_L_9aa84a70_-2000_5225:
     component: coupler_ring
     info: {}
     settings:
       bend: bend_euler
       coupler90: coupler90
       coupler_straight: coupler_straight
-      cross_section: Fcross_section_Mgdsfactorypcross_section_SRM5_CLNone_CONone
+      cross_section: strip
       gap: 0.2
       length_extension: 3
-      length_x: 0.01
+      length_x: 4
       radius: 10
-  straight_L0p01_N2_CSFcr_430c012e_-10010_10705:
+  straight_L0p6_N2_CSstrip_-14000_11000:
     component: straight
     info:
-      length: 0.01
-      route_info_length: 0.01
+      length: 0.6
+      route_info_length: 0.6
       route_info_type: xs_34e31a19
-      route_info_weight: 0.01
-      route_info_xs_34e31a19_length: 0.01
+      route_info_weight: 0.6
+      route_info_xs_34e31a19_length: 0.6
       width: 0.5
     settings:
-      cross_section: Fcross_section_Mgdsfactorypcross_section_SRM5_CLNone_CONone
-      length: 0.01
+      cross_section: strip
+      length: 0.6
       npoints: 2
-  straight_L0p01_N2_CSFcr_430c012e_10000_10705:
+  straight_L0p6_N2_CSstrip_10000_11000:
     component: straight
     info:
-      length: 0.01
-      route_info_length: 0.01
+      length: 0.6
+      route_info_length: 0.6
       route_info_type: xs_34e31a19
-      route_info_weight: 0.01
-      route_info_xs_34e31a19_length: 0.01
+      route_info_weight: 0.6
+      route_info_xs_34e31a19_length: 0.6
       width: 0.5
     settings:
-      cross_section: Fcross_section_Mgdsfactorypcross_section_SRM5_CLNone_CONone
-      length: 0.01
+      cross_section: strip
+      length: 0.6
       npoints: 2
-name: ring_double_G0p2_R10_LX_199d2a0e
+name: ring_double_G0p2_R10_LX4_LY0p6
 nets:
-- p1: coupler_ring_G0p2_R10_L_227a123a_-5_16185,o2
-  p2: straight_L0p01_N2_CSFcr_430c012e_10000_10705,o1
-- p1: coupler_ring_G0p2_R10_L_227a123a_-5_16185,o3
-  p2: straight_L0p01_N2_CSFcr_430c012e_-10010_10705,o2
-- p1: coupler_ring_G0p2_R10_L_227a123a_-5_5225,o2
-  p2: straight_L0p01_N2_CSFcr_430c012e_-10010_10705,o1
-- p1: coupler_ring_G0p2_R10_L_227a123a_-5_5225,o3
-  p2: straight_L0p01_N2_CSFcr_430c012e_10000_10705,o2
+- p1: coupler_ring_G0p2_R10_L_9aa84a70_-2000_16775,o2
+  p2: straight_L0p6_N2_CSstrip_10000_11000,o1
+- p1: coupler_ring_G0p2_R10_L_9aa84a70_-2000_16775,o3
+  p2: straight_L0p6_N2_CSstrip_-14000_11000,o2
+- p1: coupler_ring_G0p2_R10_L_9aa84a70_-2000_5225,o2
+  p2: straight_L0p6_N2_CSstrip_-14000_11000,o1
+- p1: coupler_ring_G0p2_R10_L_9aa84a70_-2000_5225,o3
+  p2: straight_L0p6_N2_CSstrip_10000_11000,o2
 placements:
-  coupler_ring_G0p2_R10_L_227a123a_-5_16185:
+  coupler_ring_G0p2_R10_L_9aa84a70_-2000_16775:
     mirror: false
     rotation: 180
-    x: -0.01
-    y: 21.41
-  coupler_ring_G0p2_R10_L_227a123a_-5_5225:
+    x: -4
+    y: 22
+  coupler_ring_G0p2_R10_L_9aa84a70_-2000_5225:
     mirror: false
     rotation: 0
     x: 0
     y: 0
-  straight_L0p01_N2_CSFcr_430c012e_-10010_10705:
+  straight_L0p6_N2_CSstrip_-14000_11000:
     mirror: false
     rotation: 90
-    x: -10.01
+    x: -14
     y: 10.7
-  straight_L0p01_N2_CSFcr_430c012e_10000_10705:
+  straight_L0p6_N2_CSstrip_10000_11000:
     mirror: false
     rotation: 270
     x: 10
-    y: 10.71
+    y: 11.3
 ports:
-  o1: coupler_ring_G0p2_R10_L_227a123a_-5_5225,o1
-  o2: coupler_ring_G0p2_R10_L_227a123a_-5_5225,o4
-  o3: coupler_ring_G0p2_R10_L_227a123a_-5_16185,o4
-  o4: coupler_ring_G0p2_R10_L_227a123a_-5_16185,o1
+  o1: coupler_ring_G0p2_R10_L_9aa84a70_-2000_5225,o1
+  o2: coupler_ring_G0p2_R10_L_9aa84a70_-2000_5225,o4
+  o3: coupler_ring_G0p2_R10_L_9aa84a70_-2000_16775,o4
+  o4: coupler_ring_G0p2_R10_L_9aa84a70_-2000_16775,o1