diff --git a/src/qudi/gui/terascan/terascan_gui.py b/src/qudi/gui/terascan/terascan_gui.py index f72a5ac..2391139 100644 --- a/src/qudi/gui/terascan/terascan_gui.py +++ b/src/qudi/gui/terascan/terascan_gui.py @@ -134,12 +134,12 @@ def _scan_finished(self) -> None: @QtCore.Slot(object) def _receive_data(self, data: List[TerascanData]) -> None: img = np.zeros((len(data),2)) - for i in range(len(data)): + for i in range(len(data) - 1): # print(np.average(data[i].counts)) - #img[i][0] = data[i].wavelength - #img[i][1] = data[i].counts - img[i][0] = 775 + 15 * np.random.rand() - img[i][1] = 100 * np.random.rand() + img[i][0] = data[i].wavelength + img[i][1] = data[i].counts + # img[i][0] = 775 + 15 * np.random.rand() + # img[i][1] = 100 * np.random.rand() self._mw.data_item.setData(x = img[:, 0], y = img[:, 1]) diff --git a/src/qudi/hardware/daq/nidaq.py b/src/qudi/hardware/daq/nidaq.py index f45839e..031b973 100644 --- a/src/qudi/hardware/daq/nidaq.py +++ b/src/qudi/hardware/daq/nidaq.py @@ -52,7 +52,7 @@ def on_activate(self): name=v['name'], port=v['port'], description=v['description'], - ) for _,v in self._daq_ch_config.items() + ) for v in self._daq_ch_config.values() ) self._analog_channels: List[ReaderVal] = [] @@ -71,7 +71,7 @@ def on_deactivate(self): def active_channels(self) -> List[str]: """ Read-only property returning the currently configured active channel names """ - out = self._analog_channels + out = self._analog_channels.copy() out.extend(self._digital_channels) temp = (i.description for i in out) return temp @@ -84,10 +84,10 @@ def get_reading(self) -> List[ReaderVal]: with nidaqmx.Task() as task: for i in self._analog_channels: chan = self._get_channel(i) - task.ai_channels.add_ai_chan(chan) + task.ai_channels.add_ai_voltage_chan(chan) data = task.read() - if len(data) == 1: + if not isinstance(data, list): data = [data] self._update_vals(data, self._analog_channels) @@ -103,10 +103,10 @@ def get_reading(self) -> List[ReaderVal]: if not isinstance(data, list): data = [data] - self._update_vals(data, self._analog_channels) + self._update_vals(data, self._digital_channels) - out = self._analog_channels + out = self._analog_channels.copy() out.extend(self._digital_channels) return out @@ -120,7 +120,7 @@ def _update_vals(self, vals: List[float], chans: List[ReaderVal]) -> None: """ if (len(vals) != len(chans)): - self.__logger.warning('Mismatch between number of configured channels and number of data points read.') + self.log.warning('Mismatch between number of configured channels and number of data points read.') for v, c in zip(vals, chans): c.val = v diff --git a/src/qudi/logic/common/fast_counter_logic.py b/src/qudi/logic/common/fast_counter_logic.py index 4d970a7..2acb738 100644 --- a/src/qudi/logic/common/fast_counter_logic.py +++ b/src/qudi/logic/common/fast_counter_logic.py @@ -46,7 +46,6 @@ def on_activate(self): self.__timer = QtCore.QTimer() self.__timer.setSingleShot(True) self.__timer.timeout.connect(self.__update_data) - # self.__timer.start(0) # 0-timer to call as often as possible def on_deactivate(self): """ Perform required deactivation. """ @@ -70,8 +69,7 @@ def configure(self, if record_length_s is not None and record_length_s > 0: self._record_length_s = record_length_s if (self._bin_width_s >= self._record_length_s): - # self.__logger.warning('Bin width is greater than or equal to record length') - print('Bin width is greater than or equal to record length') + self.log.warning('Bin width is greater than or equal to record length') with self._thread_lock: counter = self._counter() @@ -83,7 +81,7 @@ def start_counter(self): counter = self._counter() counter.configure(self._bin_width_s, self._record_length_s) counter.start_measure() - self.__timer.start(int(self._record_length_s*1000) + 1) + self.__timer.start(int(self._record_length_s*1000)) self.sigScanStarted.emit() @QtCore.Slot() @@ -99,4 +97,5 @@ def __update_data(self): with self._thread_lock: counter = self._counter() self._last_data = counter.get_data_trace() + self.__timer.start(int(self._record_length_s*1000)) self.sigScanFinished.emit(self._last_data) \ No newline at end of file diff --git a/src/qudi/logic/common/scanning_laser_logic.py b/src/qudi/logic/common/scanning_laser_logic.py index 7508af7..8028d44 100644 --- a/src/qudi/logic/common/scanning_laser_logic.py +++ b/src/qudi/logic/common/scanning_laser_logic.py @@ -107,7 +107,6 @@ def set_wavelengths(self, start: float, stop: float) -> None: def start_scan(self): if self.module_state() == 'idle': with self._thread_lock: - print('starting scan in scanning_laser_logic') laser = self._laser() laser.start_scan(self._start_wavelength, self._end_wavelength) self.sigScanStarted.emit() diff --git a/src/qudi/logic/terascan_logic.py b/src/qudi/logic/terascan_logic.py index 3efc386..16fff97 100644 --- a/src/qudi/logic/terascan_logic.py +++ b/src/qudi/logic/terascan_logic.py @@ -101,8 +101,8 @@ def on_activate(self): self.sigStopScan.connect(laser.stop_scan, QtCore.Qt.QueuedConnection) self.sigStopScan.connect(wavemeter.stop_reading, QtCore.Qt.QueuedConnection) - self.sigStopCounting.connect(counter.stop_counter, QtCore.Qt.QueuedConnection) self.sigStartCounting.connect(counter.start_counter, QtCore.Qt.QueuedConnection) + self.sigStopCounting.connect(counter.stop_counter, QtCore.Qt.QueuedConnection) # Inputs: laser.sigScanStarted.connect(self._laser_scan_started) @@ -123,11 +123,9 @@ def on_deactivate(self): @QtCore.Slot() def start_scan(self): with self._thread_lock: - print('start_scan in tereascan_logic.py') if self.module_state() == 'idle': self.module_state.lock() self._current_data = [] - print('actually start_scan in tereascan_logic.py') self.sigStartScan.emit() @QtCore.Slot() @@ -176,7 +174,7 @@ def _process_counter_data(self, data: np.ndarray): self._current_data.append( TerascanData( wavelength=self._current_wavelength, - counts=np.sum(data), + counts=data[0][0], ) ) self.sigCountsUpdated.emit(self._current_data)