From 888ed1d27c050bc3dea894fe9e7a976fa93087bd Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Thu, 7 Jul 2022 18:56:22 +0200 Subject: [PATCH] cleaned up cameras --- config/config.json | 5 +++++ devices.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config/config.json b/config/config.json index acff926..452a9b4 100644 --- a/config/config.json +++ b/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": { diff --git a/devices.py b/devices.py index 166e3e9..ab94e3e 100644 --- a/devices.py +++ b/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"], }, },