Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions pydevices/HtsDevices/acq2106_423st.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,10 @@ class MDSWorker(threading.Thread):
def __init__(self, dev):
super(_ACQ2106_423ST.MDSWorker, self).__init__(name=dev.path)

self.dev = dev.copy()
self.dev = dev

self.chans = []
self.decim = []
self.nchans = self.dev.sites*32

for i in range(self.nchans):
self.chans.append(getattr(self.dev, 'input_%3.3d' % (i+1)))
self.decim.append(
getattr(self.dev, 'input_%3.3d_decimate' % (i+1)).data())

self.seg_length = self.dev.seg_length.data()
self.segment_bytes = self.seg_length*self.nchans*np.int16(0).nbytes

Expand All @@ -198,9 +191,18 @@ def lcma(arr):
ans = lcm(ans, e)
return int(ans)

self.dev = self.dev.copy()

if self.dev.debug:
print("MDSWorker running")

self.chans = []
self.decim = []
for i in range(self.nchans):
self.chans.append(getattr(self.dev, 'input_%3.3d' % (i+1)))
self.decim.append(
getattr(self.dev, 'input_%3.3d_decimate' % (i+1)).data())

event_name = self.dev.seg_event.data()

dt = 1./self.dev.freq.data()
Expand Down
22 changes: 12 additions & 10 deletions pydevices/HtsDevices/acq2106_435st.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,18 +188,11 @@ class MDSWorker(threading.Thread):
def __init__(self, dev):
super(_ACQ2106_435ST.MDSWorker, self).__init__(name=dev.path)

self.dev = dev.copy()
self.dev = dev

self.chans = []
self.decim = []
self.nchans = self.dev.sites*32
self.resampling = self.dev.resampling

for i in range(self.nchans):
self.chans.append(getattr(self.dev, 'input_%3.3d' % (i+1)))
self.decim.append(
getattr(self.dev, 'input_%3.3d_decimate' % (i+1)).data())


self.seg_length = self.dev.seg_length.data()
self.segment_bytes = self.seg_length*self.nchans*np.int32(0).nbytes

Expand All @@ -225,8 +218,17 @@ def lcma(arr):
ans = lcm(ans, e)
return int(ans)

self.dev = self.dev.copy()

if self.dev.debug:
print("MDSWorker running")

self.chans = []
self.decim = []
for i in range(self.nchans):
self.chans.append(getattr(self.dev, 'input_%3.3d' % (i+1)))
self.decim.append(
getattr(self.dev, 'input_%3.3d_decimate' % (i+1)).data())

event_name = self.dev.seg_event.data()

Expand Down Expand Up @@ -499,7 +501,7 @@ def init(self, resampling=False):
self.slots[card].nacc = '1'

self.running.on = True
# If resampling == 1, then resampling is used during streaming:
# If resampling is True, then resampling is used during streaming:
self.resampling = resampling

thread = self.MDSWorker(self)
Expand Down