Merge pull request #398 from gdsfactory/update_latest_gdsfactory856

update_latest_gdsfactory856
gdsfactory · Jul 21, 2024 · 9103aab · 9103aab
2 parents 9cfadd8 + 6266fa5
commit 9103aab
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 51 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory~=8.5.1",
+  "gdsfactory~=8.5.6",
   "gplugins[sax]>=1,<2"
 ]
 description = "ubcpdk pdk"

diff --git a/tests/ref/coupler_coupler_G0p236__159c01fd.gds b/tests/ref/coupler_coupler_G0p236__159c01fd.gds
diff --git a/tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml
@@ -1,10 +1,8 @@
 info:
   length: 10.186
   min_bend_radius: 11.857
-name: coupler_G0p236_L20_D4_D_97fe768b
+name: coupler_G0p236_L20_D4_D_e8f9c7a8
 settings:
-  coupler_straight: coupler_straight
-  coupler_symmetric: coupler_symmetric
   cross_section: strip
   dx: 10
   dy: 4

diff --git a/tests/test_netlists/test_netlists_ebeam_dc_te1550_.yml b/tests/test_netlists/test_netlists_ebeam_dc_te1550_.yml
@@ -1,5 +1,5 @@
 instances: {}
-name: coupler_G0p236_L20_D4_D_97fe768b
+name: coupler_G0p236_L20_D4_D_e8f9c7a8
 nets: []
 placements: {}
 ports: {}
diff --git a/tests/test_netlists/test_netlists_ring_double_.yml b/tests/test_netlists/test_netlists_ring_double_.yml
@@ -1,5 +1,5 @@
 instances:
-  coupler_ring_G0p2_R10_L_4c94bf2e_-2000_17022:
+  coupler_ring_G0p2_R10_L_13fd066c_-2000_17022:
     component: coupler_ring
     info: {}
     settings:
@@ -9,7 +9,8 @@ instances:
       length_extension: 3
       length_x: 4
       radius: 10
-  coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977:
+      straight: straight
+  coupler_ring_G0p2_R10_L_13fd066c_-2000_4977:
     component: coupler_ring
     info: {}
     settings:
@@ -19,6 +20,7 @@ instances:
       length_extension: 3
       length_x: 4
       radius: 10
+      straight: straight
   straight_L0p6_N2_CSstrip_-14000_11000:
     component: straight
     info:
@@ -47,21 +49,21 @@ instances:
       npoints: 2
 name: ring_double_G0p2_R10_LX4_LY0p6
 nets:
-- p1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_17022,o2
+- p1: coupler_ring_G0p2_R10_L_13fd066c_-2000_17022,o2
   p2: straight_L0p6_N2_CSstrip_10000_11000,o1
-- p1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_17022,o3
+- p1: coupler_ring_G0p2_R10_L_13fd066c_-2000_17022,o3
   p2: straight_L0p6_N2_CSstrip_-14000_11000,o2
-- p1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o2
+- p1: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o2
   p2: straight_L0p6_N2_CSstrip_-14000_11000,o1
-- p1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o3
+- p1: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o3
   p2: straight_L0p6_N2_CSstrip_10000_11000,o2
 placements:
-  coupler_ring_G0p2_R10_L_4c94bf2e_-2000_17022:
+  coupler_ring_G0p2_R10_L_13fd066c_-2000_17022:
     mirror: false
     rotation: 180
     x: -4
     y: 22
-  coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977:
+  coupler_ring_G0p2_R10_L_13fd066c_-2000_4977:
     mirror: false
     rotation: 0
     x: 0
@@ -77,7 +79,7 @@ placements:
     x: 10
     y: 11.3
 ports:
-  o1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o1
-  o2: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o4
-  o3: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_17022,o4
-  o4: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_17022,o1
+  o1: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o1
+  o2: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o4
+  o3: coupler_ring_G0p2_R10_L_13fd066c_-2000_17022,o4
+  o4: coupler_ring_G0p2_R10_L_13fd066c_-2000_17022,o1
diff --git a/tests/test_netlists/test_netlists_ring_single_.yml b/tests/test_netlists/test_netlists_ring_single_.yml
@@ -31,7 +31,7 @@ instances:
     settings:
       cross_section: strip
       radius: 10
-  coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977:
+  coupler_ring_G0p2_R10_L_13fd066c_-2000_4977:
     component: coupler_ring
     info: {}
     settings:
@@ -41,6 +41,7 @@ instances:
       length_extension: 3
       length_x: 4
       radius: 10
+      straight: straight
   straight_L0p6_N2_CSstrip_-14000_11000:
     component: straight
     info:
@@ -90,9 +91,9 @@ nets:
   p2: straight_L0p6_N2_CSstrip_10000_11000,o1
 - p1: bend_euler_CSstrip_R10_5375_16675,o2
   p2: straight_L4_N2_CSstrip_-2000_21300,o1
-- p1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o2
+- p1: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o2
   p2: straight_L0p6_N2_CSstrip_-14000_11000,o1
-- p1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o3
+- p1: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o3
   p2: straight_L0p6_N2_CSstrip_10000_11000,o2
 placements:
   bend_euler_CSstrip_R10_-9375_16675:
@@ -105,7 +106,7 @@ placements:
     rotation: 90
     x: 10
     y: 11.3
-  coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977:
+  coupler_ring_G0p2_R10_L_13fd066c_-2000_4977:
     mirror: false
     rotation: 0
     x: 0
@@ -126,5 +127,5 @@ placements:
     x: 0
     y: 21.3
 ports:
-  o1: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o1
-  o2: coupler_ring_G0p2_R10_L_4c94bf2e_-2000_4977,o4
+  o1: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o1
+  o2: coupler_ring_G0p2_R10_L_13fd066c_-2000_4977,o4
diff --git a/tests/test_netlists/test_netlists_ring_single_heater_.yml b/tests/test_netlists/test_netlists_ring_single_heater_.yml
@@ -1,5 +1,5 @@
 instances:
-  bend_euler_R10_A90_P0p5_8747be7e_-7000_16710:
+  bend_euler_CSstrip_heat_75ea66dd_-7000_16710:
     component: bend_euler
     info:
       dy: 10
@@ -13,13 +13,9 @@ instances:
       route_info_weight: 16.637
       route_info_xs_263b49b5_length: 16.637
     settings:
-      allow_min_radius_violation: false
-      angle: 90
       cross_section: strip_heater_metal
-      p: 0.5
       radius: 10
-      with_arc_floorplan: true
-  bend_euler_R10_A90_P0p5_8747be7e_6000_16710:
+  bend_euler_CSstrip_heat_75ea66dd_6000_16710:
     component: bend_euler
     info:
       dy: 10
@@ -33,12 +29,8 @@ instances:
       route_info_weight: 16.637
       route_info_xs_263b49b5_length: 16.637
     settings:
-      allow_min_radius_violation: false
-      angle: 90
       cross_section: strip_heater_metal
-      p: 0.5
       radius: 10
-      with_arc_floorplan: true
   coupler_ring_G0p2_R10_L_94547a52_-500_4702:
     component: coupler_ring
     info: {}
@@ -109,21 +101,21 @@ instances:
       - 10
 name: ring_double_heater_G0p2_8e96fef6
 nets:
-- p1: bend_euler_R10_A90_P0p5_8747be7e_-7000_16710,e1
+- p1: bend_euler_CSstrip_heat_75ea66dd_-7000_16710,e1
   p2: straight_L1_N2_CSstrip__f1c4f592_-500_20710,e2
-- p1: bend_euler_R10_A90_P0p5_8747be7e_-7000_16710,e2
+- p1: bend_euler_CSstrip_heat_75ea66dd_-7000_16710,e2
   p2: straight_L0p01_N2_CSstr_b7a6e359_-11000_10705,e2
-- p1: bend_euler_R10_A90_P0p5_8747be7e_-7000_16710,o1
+- p1: bend_euler_CSstrip_heat_75ea66dd_-7000_16710,o1
   p2: straight_L1_N2_CSstrip__f1c4f592_-500_20710,o2
-- p1: bend_euler_R10_A90_P0p5_8747be7e_-7000_16710,o2
+- p1: bend_euler_CSstrip_heat_75ea66dd_-7000_16710,o2
   p2: straight_L0p01_N2_CSstr_b7a6e359_-11000_10705,o2
-- p1: bend_euler_R10_A90_P0p5_8747be7e_6000_16710,e1
+- p1: bend_euler_CSstrip_heat_75ea66dd_6000_16710,e1
   p2: straight_L0p01_N2_CSstr_b7a6e359_10000_10705,e1
-- p1: bend_euler_R10_A90_P0p5_8747be7e_6000_16710,e2
+- p1: bend_euler_CSstrip_heat_75ea66dd_6000_16710,e2
   p2: straight_L1_N2_CSstrip__f1c4f592_-500_20710,e1
-- p1: bend_euler_R10_A90_P0p5_8747be7e_6000_16710,o1
+- p1: bend_euler_CSstrip_heat_75ea66dd_6000_16710,o1
   p2: straight_L0p01_N2_CSstr_b7a6e359_10000_10705,o1
-- p1: bend_euler_R10_A90_P0p5_8747be7e_6000_16710,o2
+- p1: bend_euler_CSstrip_heat_75ea66dd_6000_16710,o2
   p2: straight_L1_N2_CSstrip__f1c4f592_-500_20710,o1
 - p1: coupler_ring_G0p2_R10_L_94547a52_-500_4702,e2
   p2: straight_L0p01_N2_CSstr_b7a6e359_-11000_10705,e1
@@ -134,12 +126,12 @@ nets:
 - p1: coupler_ring_G0p2_R10_L_94547a52_-500_4702,o3
   p2: straight_L0p01_N2_CSstr_b7a6e359_10000_10705,o2
 placements:
-  bend_euler_R10_A90_P0p5_8747be7e_-7000_16710:
+  bend_euler_CSstrip_heat_75ea66dd_-7000_16710:
     mirror: false
     rotation: 180
     x: -1
     y: 20.71
-  bend_euler_R10_A90_P0p5_8747be7e_6000_16710:
+  bend_euler_CSstrip_heat_75ea66dd_6000_16710:
     mirror: false
     rotation: 90
     x: 10

diff --git a/tests/test_netlists/test_netlists_ring_with_crossing_.yml b/tests/test_netlists/test_netlists_ring_with_crossing_.yml
@@ -31,18 +31,17 @@ instances:
     settings:
       cross_section: strip
       radius: 5
-  coupler_ring_G0p2_R5_LX_ea9dedfe_-2000_2475:
+  coupler_ring_G0p2_R5_LX_ba10ec54_-2000_2475:
     component: coupler_ring
     info: {}
     settings:
       bend: bend_euler
-      coupler90: coupler90
-      coupler_straight: coupler_straight
       cross_section: strip
       gap: 0.2
       length_extension: 3
       length_x: 4
       radius: 5
+      straight: straight
   ebeam_crossing4_2ports_5000_10600:
     component: ebeam_crossing4_2ports
     info: {}
@@ -83,7 +82,7 @@ nets:
   p2: ebeam_crossing4_2ports_5000_10600,o4
 - p1: bend_euler_CSstrip_R5_2875_18275,o2
   p2: straight_L4_N2_CSstrip_-2000_20400,o2
-- p1: coupler_ring_G0p2_R5_LX_ea9dedfe_-2000_2475,o2
+- p1: coupler_ring_G0p2_R5_LX_ba10ec54_-2000_2475,o2
   p2: straight_L9p70000000000_c887c097_-9000_10550,o2
 placements:
   bend_euler_CSstrip_R5_-6875_18275:
@@ -96,7 +95,7 @@ placements:
     rotation: 90
     x: 5
     y: 15.4
-  coupler_ring_G0p2_R5_LX_ea9dedfe_-2000_2475:
+  coupler_ring_G0p2_R5_LX_ba10ec54_-2000_2475:
     mirror: false
     rotation: 0
     x: 0
@@ -117,14 +116,14 @@ placements:
     x: -9
     y: 15.4
 ports:
-  o1: coupler_ring_G0p2_R5_LX_ea9dedfe_-2000_2475,o1
-  o2: coupler_ring_G0p2_R5_LX_ea9dedfe_-2000_2475,o4
+  o1: coupler_ring_G0p2_R5_LX_ba10ec54_-2000_2475,o1
+  o2: coupler_ring_G0p2_R5_LX_ba10ec54_-2000_2475,o4
 warnings:
   optical:
     unconnected_ports:
     - message: 2 unconnected optical ports!
       ports:
-      - coupler_ring_G0p2_R5_LX_ea9dedfe_-2000_2475,o3
+      - coupler_ring_G0p2_R5_LX_ba10ec54_-2000_2475,o3
       - ebeam_crossing4_2ports_5000_10600,o1
       values:
       - - 5000

diff --git a/ubcpdk/gds/ebeam_adiabatic_te1550.oas b/ubcpdk/gds/ebeam_adiabatic_te1550.oas
diff --git a/ubcpdk/gds/thermal_phase_shifters.oas b/ubcpdk/gds/thermal_phase_shifters.oas