Skip to content

Commit 580dfdc

Browse files
committed
fix issue with calling len() on unsized object in scee.py:clean_inputs()
1 parent 170a6b9 commit 580dfdc

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

SiPANN/scee.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import warnings
2-
from abc import ABC, abstractmethod
2+
from abc import ABC
3+
from abc import abstractmethod
34

45
import gdspy
56
import numpy as np
@@ -166,8 +167,7 @@ def clean_inputs(inputs):
166167
inputs = list(inputs)
167168
# make all scalars into numpy arrays
168169
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()
171171

172172
# take largest size of numpy arrays, or set value (if it's not 0)
173173
n = max(len(i) for i in inputs)
@@ -517,7 +517,7 @@ def gds(
517517
if units == "nms":
518518
scale = 1
519519
elif units == "microns":
520-
scale = 10 ** -3
520+
scale = 10**-3
521521
else:
522522
raise ValueError("Invalid units")
523523

@@ -861,7 +861,7 @@ def gds(self, filename=None, view=False, extra=0, units="nms"):
861861
if units == "nms":
862862
scale = 1
863863
elif units == "microns":
864-
scale = 10 ** -3
864+
scale = 10**-3
865865
else:
866866
raise ValueError("Invalid units")
867867

@@ -1049,7 +1049,7 @@ def gds(self, filename=None, view=False, extra=0, units="nms"):
10491049
if units == "nms":
10501050
scale = 1
10511051
elif units == "microns":
1052-
scale = 10 ** -3
1052+
scale = 10**-3
10531053
else:
10541054
raise ValueError("Invalid units")
10551055

@@ -1216,7 +1216,7 @@ def gds(
12161216
if units == "nms":
12171217
scale = 1
12181218
elif units == "microns":
1219-
scale = 10 ** -3
1219+
scale = 10**-3
12201220
else:
12211221
raise ValueError("Invalid units")
12221222

@@ -1379,9 +1379,9 @@ def predict(self, ports, wavelength):
13791379
offset = np.pi / 2
13801380

13811381
# 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)
13831383
z_dist = length + 2 * np.sqrt(
1384-
H ** 2 + (V * np.pi / 2) ** 2
1384+
H**2 + (V * np.pi / 2) ** 2
13851385
) / np.pi * special.ellipeinc(np.pi, m)
13861386
if (
13871387
1 in ports
@@ -1419,7 +1419,7 @@ def gds(
14191419
if units == "nms":
14201420
scale = 1
14211421
elif units == "microns":
1422-
scale = 10 ** -3
1422+
scale = 10**-3
14231423
else:
14241424
raise ValueError("Invalid units")
14251425

@@ -1986,7 +1986,7 @@ def gds(self, filename=None, extra=0, units="microns", view=False):
19861986
if units == "nms":
19871987
scale = 1
19881988
elif units == "microns":
1989-
scale = 10 ** -3
1989+
scale = 10**-3
19901990
else:
19911991
raise ValueError("Invalid units")
19921992

0 commit comments

Comments
 (0)