Skip to content

Fix bad np.array call in Output.expand_timeseries #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Fix bad np.array call in Output.expand_timeseries #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion labscript/labscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import threading
from inspect import getcallargs
from functools import wraps, lru_cache
import numpy as np

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