Skip to content

Remove use of numpy_dtype_workaround #61

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
chrisjbillington merged 1 commit into from
May 23, 2020
Merged

Remove use of numpy_dtype_workaround #61

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
11 changes: 5 additions & 6 deletions labscript/labscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

from __future__ import division, unicode_literals, print_function, absolute_import
from labscript_utils import PY2
from labscript_utils.numpy_dtype_workaround import dtype_workaround
if PY2:
str = unicode
import __builtin__ as builtins
Expand Down Expand Up @@ -1787,7 +1786,7 @@ def close(self, t):

def generate_code(self, hdf5_file):
classname = self.__class__.__name__
calibration_table_dtypes = dtype_workaround([('name','a256'), ('open_delay',float), ('close_delay',float)])
calibration_table_dtypes = [('name','a256'), ('open_delay',float), ('close_delay',float)]
if classname not in hdf5_file['calibrations']:
hdf5_file['calibrations'].create_dataset(classname, (0,), dtype=calibration_table_dtypes, maxshape=(None,))
metadata = (self.name,self.open_delay,self.close_delay)
Expand Down Expand Up @@ -2124,7 +2123,7 @@ class LabscriptError(Exception):

def save_time_markers(hdf5_file):
time_markers = compiler.time_markers
dtypes = dtype_workaround([('label','a256'), ('time', float), ('color', '(1,3)int')])
dtypes = [('label','a256'), ('time', float), ('color', '(1,3)int')]
data_array = zeros(len(time_markers), dtype=dtypes)
for i, t in enumerate(time_markers):
data_array[i] = time_markers[t]["label"], t, time_markers[t]["color"]
Expand Down Expand Up @@ -2170,10 +2169,10 @@ def generate_connection_table(hdf5_file):

connection_table.sort()
vlenstring = h5py.special_dtype(vlen=str)
connection_table_dtypes = dtype_workaround([('name','a256'), ('class','a256'), ('parent','a256'), ('parent port','a256'),
connection_table_dtypes = [('name','a256'), ('class','a256'), ('parent','a256'), ('parent port','a256'),
('unit conversion class','a256'), ('unit conversion params', vlenstring),
('BLACS_connection','a'+str(max_BLACS_conn_length)),
('properties', vlenstring)])
('properties', vlenstring)]
connection_table_array = empty(len(connection_table),dtype=connection_table_dtypes)
for i, row in enumerate(connection_table):
connection_table_array[i] = row
Expand Down Expand Up @@ -2257,7 +2256,7 @@ def write_device_properties(hdf5_file):


def generate_wait_table(hdf5_file):
dtypes = dtype_workaround([('label','a256'), ('time', float), ('timeout', float)])
dtypes = [('label','a256'), ('time', float), ('timeout', float)]
data_array = zeros(len(compiler.wait_table), dtype=dtypes)
for i, t in enumerate(sorted(compiler.wait_table)):
label, timeout = compiler.wait_table[t]
Expand Down