slic/bernina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up cameras

Browse Source
This commit is contained in:
augustin_s
2022-07-07 18:56:22 +02:00
parent eb89f7cf79
commit 888ed1d27c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.json
View File

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

6
devices.py
View File

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