set timeout based on pixel count and dwell, and handle dynamic return…

… type from read (list vs list of list depending on dim)
python-microscopy · barentine · Oct 10, 2024 · Jan 29, 2025 · Jan 30, 2025 · Feb 24, 2025
commit e844c36e9000a25df8755b99f08c28aeb778aca0
diff --git a/PYME/Acquire/Hardware/pointscan_shim/nidaq_scanner.py b/PYME/Acquire/Hardware/pointscan_shim/nidaq_scanner.py
@@ -30,7 +30,7 @@
 #         'min_val': -1,
 #         'max_val': 1,
 #         'units': VoltageUnits.VOLTS,
-#         'terminal_config': TerminalConfiguration.NRSE
+#         'terminal_config': TerminalConfiguration.RSE
 #     },
 # }
 
@@ -168,16 +168,19 @@ def _scan(self):
             # start counter task (which should actually kick this whole thing off)
             ctr_task.start()
             # wait until we're done
-            ctr_task.wait_until_done()
+            ctr_task.wait_until_done(timeout=2 * self.n_steps / self._pixel_clock_rate)
             # read data from AI task
             data = ai_task.read(number_of_samples_per_channel=self.n_steps)
             # print(data)
 
         # write the scan buffer to the full frame buffer
         for ind in range(self.n_channels):
             buf = self.free_buffers.get_nowait()
-            # thought data should be (n_channels, n_steps), but comes as list of lists
-            buf[:] = np.asarray(data[ind]).reshape(self.width, self.height)
+            if self.n_channels > 1:
+                # thought data should be (n_channels, n_steps), but comes as list of lists
+                buf[:] = np.asarray(data[ind]).reshape(self.width, self.height)
+            else:
+                buf[:] = np.asarray(data).reshape(self.width, self.height)
             with self.full_buffer_lock:
                 self.full_buffers.put(buf)
                 self.n_full += 1