Skip to content

Commit 01cc205

Browse files
authored
Merge pull request #101 from dihm/dtype_hotfix
Fix bad np.array call in `Output.expand_timeseries`
2 parents bc7fa4b + ad99124 commit 01cc205

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

labscript/labscript.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import threading
2020
from inspect import getcallargs
2121
from functools import wraps, lru_cache
22+
import numpy as np
2223

2324
# Notes for v3
2425
#
@@ -1722,7 +1723,7 @@ def expand_timeseries(self,all_times,flat_all_times_len):
17221723
# If this output is not ramping, then its timeseries should
17231724
# not be expanded. It's already as expanded as it'll get.
17241725
if not self.parent_clock_line.ramping_allowed:
1725-
self.raw_output = np.array(self.timeseries, dtype=np.dtype)
1726+
self.raw_output = np.array(self.timeseries, dtype=np.dtype(self.dtype))
17261727
return
17271728
outputarray = np.empty((flat_all_times_len,), dtype=np.dtype(self.dtype))
17281729
j=0

0 commit comments

Comments
 (0)