solved a very irrelevant merge issue

cameraGui.py

@@ -16,6 +16,9 @@ from pyqtgraph_subclasses import CustomRectangularROI
 from zylaCameraWorker import CameraWorker
 from cameraParameterTree import CameraParameterTree
 
+from drivers.andorzyla import AndorZyla
+#from dummyAndor import AndorZyla
+
 import sys
 import numpy as np
 
@@ -188,8 +191,10 @@ class CameraGuiMainWindow(QMainWindow):
 if __name__ == "__main__":
     app = QtGui.QApplication([])
 
+    camera = AndorZyla(0)
+
     myGuiMainWindow = CameraGuiMainWindow()
-    cameraWorker = CameraWorker()
+    cameraWorker = CameraWorker(andor_camera=camera)
 
     cameraWorker.make_connections(myGuiMainWindow)
     myGuiMainWindow.make_connections(cameraWorker)

zylaCameraWorker.py

@@ -10,7 +10,6 @@ Created on Thu Apr  4 11:10:20 2019
 
 import numpy as np
 from PyQt5 import QtCore
-
 # from drivers.andorzyla import AndorZyla
 from dummyAndor import AndorZyla
 import threading
@@ -19,10 +18,10 @@ import threading
 class CameraWorker(QtCore.QObject):
     imageReadySignal = QtCore.pyqtSignal(np.ndarray, int)
 
-    def __init__(self):
+    def __init__(self, andor_camera):
         super().__init__()
 
-        self.cam = AndorZyla(0)
+        self.cam = andor_camera
         self.cam.Init()
         print("camera worker initialized")
 
@@ -67,6 +66,7 @@ class CameraWorker(QtCore.QObject):
         print('Acq parameters: ')
         for p in params.children()[0].children():
             print(p.name(), p.value())
+
         params.child('Basic acq parameters').child('Camera name').setValue(
             self.cam.CameraModel.getValue())
         self.cam.ExposureTime.setValue(