merging updates

SiEPIC · Nov 4, 2024 · 3eb9927 · 3eb9927
1 parent 2024408
commit 3eb9927
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 8 deletions.
diff --git a/merge/EBeam_merge.py b/merge/EBeam_merge.py
@@ -115,10 +115,23 @@ def log(text):
 # Load all the GDS/OAS files from the "submissions" folder:
 path2 = os.path.abspath(os.path.join(path,"../submissions"))
 _, _, files = next(os.walk(path2), (None, None, []))
-# Start with the edge coupled devices
+
+# Start with the edge coupled FaML devices
+files_in_alphabetical = []
 for f in sorted(files):
-    if 'FaML' in f:
-        files_in.append(os.path.join(path2,f))
+    if '.oas' in f.lower() or '.gds' in f.lower():
+        if 'FaML' in f:
+            fpath = os.path.join(path2,f)
+            layout2 = pya.Layout()
+            layout2.read(fpath)
+            top_cells = layout2.top_cells()
+            top_cells.sort(key=lambda x: x.child_instances())
+            w = top_cells[-1].bbox().width()
+            files_in_alphabetical.append ([w,fpath])
+# Then sort by cell width
+for f in sorted(files_in_alphabetical, key = lambda x: x[0]):
+    files_in.append(os.path.join(path2,f[1]))
+
 # Then all regular designs
 files_in_alphabetical = []
 for f in sorted(files):
@@ -132,7 +145,6 @@ def log(text):
             top_cells.sort(key=lambda x: x.child_instances())
             w = top_cells[-1].bbox().width()
             files_in_alphabetical.append ([w,fpath])
-# print(files_in_alphabetical)        
 # Then sort the regular designs by cell width
 for f in sorted(files_in_alphabetical, key = lambda x: x[0]):
     files_in.append(os.path.join(path2,f[1]))

diff --git a/submissions/EBeam_LukasChrostowski_MZI1_1550_FaML.oas b/submissions/EBeam_LukasChrostowski_MZI1_1550_FaML.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI2_1550_FaML.oas b/submissions/EBeam_LukasChrostowski_MZI2_1550_FaML.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_0.oas b/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_0.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_1.oas b/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_1.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_2.oas b/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_2.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_3.oas b/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_3.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_4.oas b/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_4.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_5.oas b/submissions/EBeam_LukasChrostowski_MZI3_1550_FaML_5.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI4_1550_FaML_0.oas b/submissions/EBeam_LukasChrostowski_MZI4_1550_FaML_0.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI4_1550_FaML_1.oas b/submissions/EBeam_LukasChrostowski_MZI4_1550_FaML_1.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI4_1550_FaML_2.oas b/submissions/EBeam_LukasChrostowski_MZI4_1550_FaML_2.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI_1550.oas b/submissions/EBeam_LukasChrostowski_MZI_1550.oas
diff --git a/submissions/EBeam_LukasChrostowski_MZI_loopback_1550_FaML.oas b/submissions/EBeam_LukasChrostowski_MZI_loopback_1550_FaML.oas
diff --git a/submissions/EBeam_LukasChrostowski_loopback_1550_FaML.oas b/submissions/EBeam_LukasChrostowski_loopback_1550_FaML.oas
diff --git a/submissions/KLayout Python/EBeam_LukasChrostowski_MZI2_1550_FaML.py b/submissions/KLayout Python/EBeam_LukasChrostowski_MZI2_1550_FaML.py
@@ -1,6 +1,6 @@
 '''
 --- Simple MZI, tested using Facet-Attached Micro Lenses (FaML) ---
-  
+   
 by Lukas Chrostowski, 2024
    
 Example simple script to
@@ -64,7 +64,7 @@
 and Draw the floor plan
 '''    
 cell, ly = new_layout(tech_name, top_cell_name, GUI=True, overwrite = True)
-floorplan(cell, 600e3, 244e3)
+floorplan(cell, 600e3, 229e3)
 
 dbu = ly.dbu
 
@@ -87,7 +87,8 @@
 # draw two edge couplers for facet-attached micro-lenses
 inst_faml = FaML_two(cell, 
          label = "opt_in_TE_1550_FaML_mzi2_%s" % designer_name,
-         cell_params = None
+         cell_params = None,
+         y_offset = 51e3,
          )  
 #c = inst_faml[0].cell
 #c.name = 'FaML2'
@@ -97,7 +98,7 @@
 instY1 = connect_cell(inst_faml[1], 'opt1', cell_ebeam_y, 'pin1')
 # Spiral:
 instSpiral = connect_cell(instY2, 'pin2', cell_ebeam_delay, 'optB')
-instSpiral.transform(pya.Trans(100e3,50e3))
+instSpiral.transform(pya.Trans(100e3,48e3))
 # Waveguides:
 connect_pins_with_waveguide(instY1, 'pin2', instY2, 'pin3', waveguide_type=waveguide_type1)
 connect_pins_with_waveguide(instY2, 'pin2', instSpiral, 'optB', waveguide_type=waveguide_type1)