Skip to content

Commit bda0f33

Browse files
committed
fix array dim bug in dmem readback check
1 parent 897e62c commit bda0f33

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

qick_lib/qick/drivers/tproc.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,12 @@ def load_mem(self, mem_sel, buff_in, addr=0, check=True):
675675

676676
if check:
677677
readback = self.read_mem(mem_sel, length=length, truncate=False)
678+
if mem_sel=='dmem':
679+
to_compare = buff_in.reshape((-1,1))
680+
else:
681+
to_compare = buff_in
678682
width = {'pmem': 3, 'dmem': 1, 'wmem': 6}[mem_sel]
679-
if np.array_equal(buff_in[:,:width], readback[:,:width]):
683+
if np.array_equal(to_compare[:,:width], readback[:,:width]):
680684
self.logger.info('tProc %s: readback OK'%(mem_sel))
681685
else:
682686
raise RuntimeError("tProc %s: readback does not match what was just loaded"%(mem_sel))
@@ -726,7 +730,7 @@ def read_mem(self, mem_sel, length, addr=0, truncate=True):
726730
width = {'pmem': 3, 'dmem': 1, 'wmem': 6}[mem_sel]
727731
data = data[:, :width]
728732
if mem_sel=='dmem':
729-
return data.flatten()
733+
return data.ravel()
730734
return data
731735

732736
def reload_mem(self):

0 commit comments

Comments
 (0)