|
1 | 1 | import warnings |
2 | | -from abc import ABC, abstractmethod |
| 2 | +from abc import ABC |
| 3 | +from abc import abstractmethod |
3 | 4 |
|
4 | 5 | import gdspy |
5 | 6 | import numpy as np |
@@ -166,8 +167,7 @@ def clean_inputs(inputs): |
166 | 167 | inputs = list(inputs) |
167 | 168 | # make all scalars into numpy arrays |
168 | 169 | for i in range(len(inputs)): |
169 | | - if np.isscalar(inputs[i]): |
170 | | - inputs[i] = np.array([inputs[i]]) |
| 170 | + inputs[i] = np.array(inputs[i]).flatten() |
171 | 171 |
|
172 | 172 | # take largest size of numpy arrays, or set value (if it's not 0) |
173 | 173 | n = max(len(i) for i in inputs) |
@@ -517,7 +517,7 @@ def gds( |
517 | 517 | if units == "nms": |
518 | 518 | scale = 1 |
519 | 519 | elif units == "microns": |
520 | | - scale = 10 ** -3 |
| 520 | + scale = 10**-3 |
521 | 521 | else: |
522 | 522 | raise ValueError("Invalid units") |
523 | 523 |
|
@@ -861,7 +861,7 @@ def gds(self, filename=None, view=False, extra=0, units="nms"): |
861 | 861 | if units == "nms": |
862 | 862 | scale = 1 |
863 | 863 | elif units == "microns": |
864 | | - scale = 10 ** -3 |
| 864 | + scale = 10**-3 |
865 | 865 | else: |
866 | 866 | raise ValueError("Invalid units") |
867 | 867 |
|
@@ -1049,7 +1049,7 @@ def gds(self, filename=None, view=False, extra=0, units="nms"): |
1049 | 1049 | if units == "nms": |
1050 | 1050 | scale = 1 |
1051 | 1051 | elif units == "microns": |
1052 | | - scale = 10 ** -3 |
| 1052 | + scale = 10**-3 |
1053 | 1053 | else: |
1054 | 1054 | raise ValueError("Invalid units") |
1055 | 1055 |
|
@@ -1216,7 +1216,7 @@ def gds( |
1216 | 1216 | if units == "nms": |
1217 | 1217 | scale = 1 |
1218 | 1218 | elif units == "microns": |
1219 | | - scale = 10 ** -3 |
| 1219 | + scale = 10**-3 |
1220 | 1220 | else: |
1221 | 1221 | raise ValueError("Invalid units") |
1222 | 1222 |
|
@@ -1379,9 +1379,9 @@ def predict(self, ports, wavelength): |
1379 | 1379 | offset = np.pi / 2 |
1380 | 1380 |
|
1381 | 1381 | # determine z distance - length + 2*sbend length |
1382 | | - m = (V * np.pi / 2) ** 2 / (H ** 2 + (V * np.pi / 2) ** 2) |
| 1382 | + m = (V * np.pi / 2) ** 2 / (H**2 + (V * np.pi / 2) ** 2) |
1383 | 1383 | z_dist = length + 2 * np.sqrt( |
1384 | | - H ** 2 + (V * np.pi / 2) ** 2 |
| 1384 | + H**2 + (V * np.pi / 2) ** 2 |
1385 | 1385 | ) / np.pi * special.ellipeinc(np.pi, m) |
1386 | 1386 | if ( |
1387 | 1387 | 1 in ports |
@@ -1419,7 +1419,7 @@ def gds( |
1419 | 1419 | if units == "nms": |
1420 | 1420 | scale = 1 |
1421 | 1421 | elif units == "microns": |
1422 | | - scale = 10 ** -3 |
| 1422 | + scale = 10**-3 |
1423 | 1423 | else: |
1424 | 1424 | raise ValueError("Invalid units") |
1425 | 1425 |
|
@@ -1986,7 +1986,7 @@ def gds(self, filename=None, extra=0, units="microns", view=False): |
1986 | 1986 | if units == "nms": |
1987 | 1987 | scale = 1 |
1988 | 1988 | elif units == "microns": |
1989 | | - scale = 10 ** -3 |
| 1989 | + scale = 10**-3 |
1990 | 1990 | else: |
1991 | 1991 | raise ValueError("Invalid units") |
1992 | 1992 |
|
|
0 commit comments