Merge branch 'master' of https://code.df.uba.ar/martindrech/total_control_app

cameraGui.py

@@ -21,6 +21,9 @@ from measurement import MeasurementFrame
 import sys
 import numpy as np
 
+import logging
+LOG = logging.getLogger('Main logger')
+GUI_LOG = LOG.getChild('GUI logger')
 
 class CameraGuiMainWindow(QMainWindow):
     
@@ -38,7 +41,7 @@ class CameraGuiMainWindow(QMainWindow):
         self.initUI()
 
     def initUI(self):
-
+        GUI_LOG.info('Initializing gui')
         self.win = QtGui.QMainWindow()
         self.win.setWindowTitle("Camera GUI")
         self.win.setWindowIcon(QtGui.QIcon('Butter_robot.png'))

drivers/andorzyla.py

@@ -59,7 +59,7 @@ def create_aligned_array(shape, dtype=np.typeDict['singlecomplex'], boundary=16)
 
 class Helper_messager(QtCore.QObject):
     imageAquiredSignal = QtCore.pyqtSignal(int)
-
+    timeoutSignal = QtCore.pyqtSignal()
 
 class AndorBase(SDK3Camera):
     
@@ -752,17 +752,16 @@ class AndorBase(SDK3Camera):
         if self.TriggerMode.getString()=='Internal':
             timeout = self.ExposureTime.getValue() * 5000
         if self.TriggerMode.getString()=='Software':
-            timeout = 1000000
+            timeout = 10000
         
         while getattr(t, "do_run", True):
             try:
                 a_s, px_encoding, xs, ys, bufs = self._live_acq_auxs
             except AttributeError:
                 print('AndorZyla object has no attribute _live_acq_auxs')
-            try:
-                pData, lData = SDK3.WaitBuffer(self.handle, int(timeout))
-            except:
-                raise Exception('Timeout in the camera')
+            
+            pData, lData = SDK3.WaitBuffer(self.handle, int(timeout))
+            
             img = create_aligned_array(xs*ys, 'uint16')
             SDK3.ConvertBuffer(bufs[self.acq_index_i%len(bufs)].ctypes.data_as(ctypes.POINTER(ctypes.c_uint8)), 
                                img.ctypes.data_as(ctypes.POINTER(ctypes.c_uint8)), 

examples/cutelog_example.py

+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Tue May 21 20:08:33 2019
+
+@author: liaf-ankylosaurus-admin
+"""
+
+import logging
+from logging.handlers import SocketHandler
+
+log = logging.getLogger('Main logger')
+gui_log = log.getChild("GUI logger")
+worker_log = log.getChild("Worker logger")
+acq_log = log.getChild("Acquisition logger")
+
+
+log.setLevel(1)  # to send all records to cutelog
+socket_handler = SocketHandler('127.0.0.1', 19996)  # default listening address
+log.addHandler(socket_handler)
+log.info('Hello world!')
+gui_log.info('hello')
+worker_log.info('hello')
+acq_log.info('hello')
+
+for i in range(5):
+    gui_log.debug('%i is the number'% (i) )
+    worker_log.info('{} sent to {}'.format(i, 'daq'))
\ No newline at end of file

main.py

@@ -10,7 +10,25 @@ from MCDAQcontrolsignals import digital_control_signal
 from controlGui import ControlGui
 
 
+import logging
+from logging.handlers import SocketHandler
+
+
 if __name__ == "__main__":
+    log = logging.getLogger('Main logger')
+    gui_log = log.getChild("GUI logger")
+    worker_log = log.getChild("Worker logger")
+    acq_log = log.getChild("Acquisition logger")
+
+
+    log.setLevel(1)  # to send all records to cutelog
+    socket_handler = SocketHandler('127.0.0.1', 19996)  # default listening address
+    log.addHandler(socket_handler)
+    log.info('Hello world!')
+    gui_log.info('hello')
+    worker_log.info('hello')
+    acq_log.info('hello')
+
     import sys
     app = QtGui.QApplication([])
     app_icon = QtGui.QIcon()

zylaCameraWorker.py

@@ -51,7 +51,7 @@ class CameraWorker(QtCore.QObject):
                 
         # internal connections
         self.cam.helper.imageAquiredSignal.connect(self.new_image_acquired)
-
+        #self.cam.helper.timeoutSignal.connect()
     def __del__(self):
         print("adios camera worker")
 
@@ -151,16 +151,17 @@ class CameraWorker(QtCore.QObject):
                 target=self.cam.live_acquisition_loop
             )
         self.acq_thread.start()
-        with self._lock:
-            self.simple_scan_measurement_step()
+        #with self._lock:
+        self.simple_scan_measurement_step()
         
             
     def simple_scan_measurement_end(self):
-    
+        print('entering scan ending in worker')    
+        self.measurementEndingSignal.emit()  
+        self.cam.trigger()
         self._stop_acquisition_loop()
-        self.cam.TriggerMode.setString('Internal')
         self.ao_to_scan.go_softly_to_value(self.measure_params['end'])     
-        self.measurementEndingSignal.emit()  
+        self.cam.TriggerMode.setString('Internal')
         print('exiting scan ending in worker')
         
     def simple_scan_measurement_step(self):
@@ -175,6 +176,8 @@ class CameraWorker(QtCore.QObject):
             print('trigger')
         except StopIteration:
             self.simple_scan_measurement_end()
+        except:
+            raise
        
     def get_scan_signal(self, ao_name):
         return [ao for ao in anal_control_signal._registry if ao.name == ao_name][0]
@@ -188,7 +191,6 @@ class CameraWorker(QtCore.QObject):
     
     def abort_measurement(self):
         self.scan_array_gen.close()
-        self.simple_scan_measurement_end()
         print('Measurement aborted')
     
     @QtCore.pyqtSlot(str)