AndorAtmcd, AndorSDK3, PVCamera: let base Device to set _index

The base Device class already sets an '_index' property based on
the 'index argument.  This removes AndorAtmcd, AndorSDK3, and
PVCamera re-setting of the value with a different default.
Instead, set the different default on the function signature and
pass it up the class hierarchy.

Author: carandraug

microscope/cameras/andorsdk3.py

@@ -101,11 +101,10 @@ def wrapper(self, *args, **kwargs):
 class AndorSDK3(devices.FloatingDeviceMixin,
                 devices.CameraDevice):
     SDK_INITIALIZED = False
-    def __init__(self, *args, **kwargs):
-        super(AndorSDK3, self).__init__(**kwargs)
+    def __init__(self, index=0, *args, **kwargs):
+        super(AndorSDK3, self).__init__(index=index, **kwargs)
         if not AndorSDK3.SDK_INITIALIZED:
             SDK3.InitialiseLibrary()
-        self._index = kwargs.get('index', 0)
         self.handle = None
         #self._sdk3cam = SDK3Camera(self._index)
         #SDK3Camera.__init__(self, self._index)

microscope/cameras/atmcd.py

@@ -1140,11 +1140,9 @@ class AndorAtmcd(devices.FloatingDeviceMixin,
                  devices.CameraDevice):
     """ Implements CameraDevice interface for Andor ATMCD library."""
     def __init__(self, index=0, *args, **kwargs):
-        super().__init__(**kwargs)
+        super().__init__(index=0, **kwargs)
         # Recursion depth for context manager behaviour.
         self._rdepth = 0
-        # The camera index in the list maintained by the DLL.
-        self._index = index
         # The handle used by the DLL to identify this camera.
         self._handle = None
         # The following parameters will be populated after hardware init.
@@ -1543,4 +1541,4 @@ def _set_roi(self, roi):
         if any([left < 1, top < 1, left+width-1 > x, top+height-1 > y]):
             return False
         self._roi = ROI(left, top, width, height)
-        return True
+        return True

microscope/cameras/pvcam.py

@@ -1185,10 +1185,8 @@ class PVCamera(devices.FloatingDeviceMixin, devices.CameraDevice):
     open_cameras = []
 
 
-    def __init__(self, *args, **kwargs):
-        super(PVCamera, self).__init__(**kwargs)
-        # Camera index in DLL.
-        self._index = kwargs.get('index', 0)
+    def __init__(self, index=0, *args, **kwargs):
+        super(PVCamera, self).__init__(index=index, **kwargs)
         # Camera name in DLL.
         self._pv_name = None
         # Camera handle.

microscope/devices.py

@@ -186,17 +186,22 @@ def get_id(self):
 
 
 class Device(object):
-    """A base device class. All devices should subclass this class."""
+    """A base device class. All devices should subclass this class.
+
+    Args:
+        index (int): the index of the device on a shared library.
+            This argument is added by the deviceserver.
+    """
     __metaclass__ = abc.ABCMeta
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, index=None, *args, **kwargs):
         self.enabled = None
         # A list of settings. (Can't serialize OrderedDict, so use {}.)
         self.settings = OrderedDict()
         # We fetch a logger here, but it can't log anything until
         # a handler is attached after we've identified this device.
         self._logger = logging.getLogger(self.__class__.__name__)
-        self._index = kwargs['index'] if 'index' in kwargs else None
+        self._index = index
 
     def __del__(self):
         self.shutdown()