jan/masque
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

Formally allow instances to point to None (i.e. an 'empty' pattern)

Browse source
This commit is contained in:
Jan Petykiewicz 2020-05-11 18:58:57 -07:00
commit 00394a62f0
6 changed files with 54 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
masque/file/gdsii.py
View file

@ -100,7 +100,9 @@ def write(patterns: Pattern or List[Pattern],
# Get a dict of id(pattern) -> pattern
patterns_by_id = {id(pattern): pattern for pattern in patterns}
for pattern in patterns:
patterns_by_id.update(pattern.referenced_patterns_by_id())
for i, p in pattern.referenced_patterns_by_id().items():
if p is not None:
patterns_by_id[i] = p
disambiguate_func(patterns_by_id.values())
@ -170,7 +172,9 @@ def dose2dtype(patterns: List[Pattern],
# Get a dict of id(pattern) -> pattern
patterns_by_id = {id(pattern): pattern for pattern in patterns}
for pattern in patterns:
patterns_by_id.update(pattern.referenced_patterns_by_id())
for i, p in pattern.referenced_patterns_by_id().items():
if p is not None:
patterns_by_id[i] = p
# Get a table of (id(pat), written_dose) for each pattern and subpattern
sd_table = make_dose_table(patterns)
@ -466,6 +470,8 @@ def _subpatterns_to_refs(subpatterns: List[SubPattern or GridRepetition]
) -> List[gdsii.elements.ARef or gdsii.elements.SRef]:
refs = []
for subpat in subpatterns:
if subpat.pattern is None:
continue
encoded_name = subpat.pattern.name
# Note: GDS mirrors first and rotates second