Merge pull request #70 from rpanderson/is-syntax-warning-bugfix

chrisjbillington · web-flow · commit 2e2785ceb914 · 2020-06-24T21:22:05.000-04:00
Bugfix for ValueError introduced in #68
diff --git a/labscript/labscript.py b/labscript/labscript.py
@@ -102,7 +102,7 @@ def bitfield(arrays,dtype):
     """converts a list of arrays of ones and zeros into a single
     array of unsigned ints of the given datatype."""
     n = {uint8:8,uint16:16,uint32:32}
-    if arrays[0] == 0:
+    if np.array_equal(arrays[0], 0):
         y = zeros(max([len(arr) if iterable(arr) else 1 for arr in arrays]),dtype=dtype)
     else:
         y = array(arrays[0],dtype=dtype)
