Add trans_path member to JunctionEntry

Keep track of transformation path of junction element

Author: qpavsmi

klayout_package/python/kqcircuits/util/replace_junctions.py

@@ -38,9 +38,18 @@
 class JunctionEntry:
     """All junction properties we want to store when extracting junctions"""
 
-    def __init__(self, class_type: type, trans: pya.DCplxTrans, parameters: Dict, parent_name: str, name: str) -> None:
+    def __init__(
+        self,
+        class_type: type,
+        trans: pya.DCplxTrans,
+        trans_path: List[pya.DCplxTrans],
+        parameters: Dict,
+        parent_name: str,
+        name: str,
+    ) -> None:
         self.type = class_type
         self.trans = trans
+        self.trans_path = trans_path
         self.parameters = parameters
         self.parent_name = parent_name
         self.name = name
@@ -246,7 +255,7 @@ def extract_junctions(top_cell: pya.Cell, tuned_junction_parameters: Dict) -> Li
     if not is_pcell:
         logging.warning("Top cell doesn't contain PCell parameter data")
 
-    def recursive_junction_search(inst, parent_name, prev_trans):
+    def recursive_junction_search(inst, parent_name, prev_trans, trans_path):
         cell = layout.cell(inst.cell_index)
         name = inst.property("id")
         trans = prev_trans * inst.dcplx_trans
@@ -305,14 +314,16 @@ def recursive_junction_search(inst, parent_name, prev_trans):
                 parent_name,
                 name,
             )
-            found_junctions.append(JunctionEntry(type(junction_type), trans, params, parent_name, name))
+            found_junctions.append(
+                JunctionEntry(type(junction_type), trans, trans_path + [inst.dcplx_trans], params, parent_name, name)
+            )
         for i in cell.each_inst():
             # For pcell oas, accumulate transformation starting from root
             # For static oas, only use parent.dcplx_trans * this.dcplx_trans
-            recursive_junction_search(i, name, trans if is_pcell else prev_trans)
+            recursive_junction_search(i, name, trans if is_pcell else prev_trans, trans_path + [inst.dcplx_trans])
 
     for i in top_cell.each_inst():
-        recursive_junction_search(i, None, i.dcplx_trans)
+        recursive_junction_search(i, None, i.dcplx_trans, [])
     # Need to know face of junctions before performing chip specific transformation,
     # because we need to know for which face we need to perform the marker position test
     if found_junctions:

tests/util/replace_junctions/test_extract_junctions.py

@@ -71,33 +71,33 @@ def test_junction_entry_equality():
     t1 = pya.DCplxTrans(1, 0, False, pya.DVector(1, 2))
     t1_ = pya.DCplxTrans(1, 0, False, pya.DVector(1, 2))
     t2 = pya.DCplxTrans(1, 180, False, pya.DVector(2, 3))
-    junction_entry = JunctionEntry(Manhattan, t1, {"a": 10, "b": 6}, "qb_0", "squid")
+    junction_entry = JunctionEntry(Manhattan, t1, [t1], {"a": 10, "b": 6}, "qb_0", "squid")
     assert junction_entry == JunctionEntry(
-        Manhattan, t1_, {"b": 6, "a": 10}, "qb_0", "squid"
+        Manhattan, t1_, [t1_], {"b": 6, "a": 10}, "qb_0", "squid"
     ), "Expected these JunctionEntry objects to be considered equal"
     assert junction_entry != JunctionEntry(
-        ManhattanSingleJunction, t1, {"a": 10, "b": 6}, "qb_0", "squid"
+        ManhattanSingleJunction, t1, [t1], {"a": 10, "b": 6}, "qb_0", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different type"
     assert junction_entry != JunctionEntry(
-        type(None), t1, {"a": 10, "b": 6}, "qb_0", "squid"
+        type(None), t1, [t1], {"a": 10, "b": 6}, "qb_0", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different type"
     assert junction_entry != JunctionEntry(
-        Manhattan, t2, {"a": 10, "b": 6}, "qb_0", "squid"
+        Manhattan, t2, [t2], {"a": 10, "b": 6}, "qb_0", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different transformation"
     assert junction_entry != JunctionEntry(
-        Manhattan, t1, {"a": 10, "b": 7}, "qb_0", "squid"
+        Manhattan, t1, [t1], {"a": 10, "b": 7}, "qb_0", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different parameters"
     assert junction_entry != JunctionEntry(
-        Manhattan, t1, {"a": 10, "b": 6, "c": 0}, "qb_0", "squid"
+        Manhattan, t1, [t1], {"a": 10, "b": 6, "c": 0}, "qb_0", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different parameters"
     assert junction_entry != JunctionEntry(
-        Manhattan, t1, {"b": 6}, "qb_0", "squid"
+        Manhattan, t1, [t1], {"b": 6}, "qb_0", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different parameters"
     assert junction_entry != JunctionEntry(
-        Manhattan, t1, {"a": 10, "b": 6}, "qb_1", "squid"
+        Manhattan, t1, [t1], {"a": 10, "b": 6}, "qb_1", "squid"
     ), "JunctionEntry objects should not be considered equal if they have different parent name"
     assert junction_entry != JunctionEntry(
-        Manhattan, t1, {"a": 10, "b": 6}, "qb_0", "squid_1"
+        Manhattan, t1, [t1], {"a": 10, "b": 6}, "qb_0", "squid_1"
     ), "JunctionEntry objects should not be considered equal if they have different parent name"