awendt/pyrelacs
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: awendt:cce7c55fe7c77b4f0e3b2c22d5964e52c4e91f80
Branches Tags
awendt:main
awendt:datastream
awendt:calibration
awendt:refactoring
..
compare: awendt:2ef018ef078accf829c872f0349cb41bcd8592b7
Branches Tags
awendt:datastream
awendt:main
awendt:calibration
awendt:refactoring

No commits in common. "cce7c55fe7c77b4f0e3b2c22d5964e52c4e91f80" and "2ef018ef078accf829c872f0349cb41bcd8592b7" have entirely different histories.
cce7c55fe7 ... 2ef018ef07

2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
pyrelacs/dataio/daq_producer.py
View File

@ -21,6 +21,7 @@ class DaqProducer:
self.device = device self.device = device
self.ai_device = self.device.get_ai_device() self.ai_device = self.device.get_ai_device()
self.channels = channels self.channels = channels
self.stop = False self.stop = False
def read_analog_continously( def read_analog_continously(
@ -162,11 +163,9 @@ class DaqProducer:
log.debug(daq_status) log.debug(daq_status)
chunk_size = transfer_status.current_total_count - prev_count chunk_size = transfer_status.current_total_count - prev_count
log.debug(f"DAQ current index {transfer_status.current_index}") log.debug(transfer_status.current_index)
log.debug(f"DAQ total count {transfer_status.current_total_count}") log.debug(transfer_status.current_total_count)
log.debug( log.debug(transfer_status.current_scan_count)
f"DAQ Samples per channel {transfer_status.current_scan_count}"
)
log.debug("Appending last chunk") log.debug("Appending last chunk")
if prev_index + chunk_size > len(data_in) - 1: if prev_index + chunk_size > len(data_in) - 1:
@ -222,7 +221,6 @@ class DaqProducer:
] ]
log.info("stopping") log.info("stopping")
log.debug(self.buffer.totalcount()) log.debug(self.buffer.totalcount())
log.debug(self.ai_device.get_scan_status())
break break
break break

2
pyrelacs/ui/mainwindow.py
View File

@ -100,7 +100,7 @@ class PyRelacs(QMainWindow):
if self.mccdaq: if self.mccdaq:
log.debug("Creating Daq Generator") log.debug("Creating Daq Generator")
self.daq_producer = DaqProducer(self.buffer, self.mccdaq.daq_device, [4, 5]) self.daq_producer = DaqProducer(self.buffer, self.mccdaq.daq_device, [1, 2])
log.debug("Creating Sinus Generator") log.debug("Creating Sinus Generator")
self.sinus_producer = SinProducer(self.buffer) self.sinus_producer = SinProducer(self.buffer)