cleaned up cameras

config/config.json

@@ -84,9 +84,14 @@
     },
     "cams_qioptiq": {
         "zoomstage_pv": "SARES20-MF1:MOT_13",
+        "focusstage_pv": "SARES20-EXP:MOT_QIOPT_F",
         "camera_pv": "SARES20-CAMS142-M2"
     },
     "cams_sigma": {
+        "zoomstage_pvs": {
+            "set_value": "SARES20-OPSI:MOT_SP",
+            "readback": "SEARES20-OPSI:MOT_RB"
+        },
         "camera_pv": "ERROR"
     },
     "Kern": {

devices.py

@@ -335,7 +335,7 @@ components = [
         "name": "cams_qioptiq",
         "z_und": 142,
         "desc": "Qioptic sample viewer in Bernina hutch",
-        "type": "slic.devices.endstations.bernina_cameras:Qioptiq",
+        "type": "slic.devices.endstations.bernina_cameras:CameraQioptiq",
         "kwargs": {
             "bshost": "sf-daqsync-01.psi.ch",
             "bsport": 11149,
@@ -348,10 +348,12 @@ components = [
         "name": "cams_sigma",
         "z_und": 142,
         "desc": "Sigma objective",
-        "type": "slic.devices.endstations.bernina_cameras:Sigma",
+        "type": "slic.devices.endstations.bernina_cameras:CameraSigma",
         "kwargs": {
             "bshost": "sf-daqsync-01.psi.ch",
             "bsport": 11149,
+            "zoomstage_pvs": config["cams_sigma"]["zoomstage_pvs"],
+            "focusstage_pvs": config["cams_sigma"]["focusstage_pvs"],
             "camera_pv": config["cams_sigma"]["camera_pv"],
         },
     },