From a9829e626c8d747996abcc96236688dd61190e7b Mon Sep 17 00:00:00 2001
From: Cammille Carinan <cammille.carinan@xfel.eu>
Date: Fri, 11 Feb 2022 13:02:26 +0100
Subject: [PATCH] Clean up mnemonics
---
src/toolbox_scs/constants.py | 49 ++++++++++++++++++++++++++++--------
1 file changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/toolbox_scs/constants.py b/src/toolbox_scs/constants.py
index dd80a3a..4a8e378 100644
--- a/src/toolbox_scs/constants.py
+++ b/src/toolbox_scs/constants.py
@@ -57,9 +57,6 @@ mnemonics = {
"M2BEND": ({'source': 'SA3_XTD10_MIRR-2/MOTOR/BENDER',
'key': 'actualPosition.value',
'dim': None},),
- "MTE3": ({'source': 'SCS_CDIDET_MTE3/CAM/CAMERA:daqOutput',
- 'key': 'data.image.pixels',
- 'dim': ['x', 'y']}, ),
"hRIXS_det": ({'source': 'SCS_HRIXS_DET/CAM/CAMERA:daqOutput',
'key': 'data.image.pixels',
'dim': ['x', 'y']}, ),
@@ -153,19 +150,19 @@ mnemonics = {
'key': 'value.value',
'dim': None},),
"PES_RV": ({'source': 'SA3_XTD10_PES/MDL/DAQ_MPOD',
- 'key': 'u215.value',
+ 'key': 'u213.value',
'dim': None},),
"PES_N2": ({'source': 'SA3_XTD10_PES/DCTRL/V30300S_NITROGEN',
- 'key': 'interlock.AActionState.value',
+ 'key': 'hardwareState.value',
'dim': None},),
"PES_Ne": ({'source': 'SA3_XTD10_PES/DCTRL/V30310S_NEON',
- 'key': 'interlock.AActionState.value',
+ 'key': 'hardwareState.value',
'dim': None},),
"PES_Kr": ({'source': 'SA3_XTD10_PES/DCTRL/V30320S_KRYPTON',
- 'key': 'interlock.AActionState.value',
+ 'key': 'hardwareState.value',
'dim': None},),
"PES_Xe": ({'source': 'SA3_XTD10_PES/DCTRL/V30330S_XENON',
- 'key': 'interlock.AActionState.value',
+ 'key': 'hardwareState.value',
'dim': None},),
# XTD10 MCP (after GATT)
@@ -295,6 +292,14 @@ mnemonics = {
'key': 'encoderPosition.value',
'dim': None},),
+ "HFM_BENDING": ({'source': 'SCS_KBS_HFM/MDL/AVERAGER',
+ 'key': 'result.value',
+ 'dim': None},),
+
+ "VFM_BENDING": ({'source': 'SCS_KBS_VFM/MDL/AVERAGER',
+ 'key': 'result.value',
+ 'dim': None},),
+
# AFS LASER
"AFS_PhaseShifter": ({'source': 'SCS_ILH_LAS/PHASESHIFTER/DOOCS',
'key': 'actualPosition.value',
@@ -332,6 +337,9 @@ mnemonics = {
"PP800_FocusLens": ({'source': 'SCS_ILH_LAS/MOTOR/LT_SPARE1',
'key': 'actualPosition.value',
'dim': None},),
+ "FFT_FocusLens": ({'source': 'SCS_CDIFFT_FDM/MOTOR/BARLOW_1',
+ 'key': 'actualPosition.value',
+ 'dim': None},),
# 1st lens of telescope (setup of August 2019)
"PP800_TeleLens": ({'source': 'SCS_ILH_LAS/MOTOR/LT7',
'key': 'actualPosition.value',
@@ -373,9 +381,12 @@ mnemonics = {
"scannerY_enc": ({'source': 'SCS_CDIFFT_SAM/ENC/SCANNERY',
'key': 'value.value',
'dim': None},),
- "SAM-Z": ({'source': 'SCS_CDIFFT_MOV/ENC/SAM_Z',
- 'key': 'value.value',
- 'dim': None},),
+ "FFT_SAM_Z": ({'source': 'SCS_CDIFFT_MOV/MOTOR/SAM_Z',
+ 'key': 'actualPosition.value',
+ 'dim': None},),
+ "FFT_SAM_Z_ENC": ({'source': 'SCS_CDIFFT_MOV/ENC/SAM_Z',
+ 'key': 'value.value',
+ 'dim': None},),
"magnet": ({'source': 'SCS_CDIFFT_MAG/ASENS/PSU_CMON',
'key': 'value.value',
'dim': None},
@@ -388,9 +399,25 @@ mnemonics = {
"Vertical_FDM": ({'source': 'SCS_CDIFFT_LDM/CAM/CAMERA1A:daqOutput',
'key': 'data.image.pixels',
'dim': ['vfdm_y', 'vfdm_x']},),
+ "Horizontal_FDM": ({'source': 'SCS_CDIFFT_LDM/CAM/CAMERA2A:daqOutput',
+ 'key': 'data.image.pixels',
+ 'dim': ['hfdm_y', 'hfdm_x']},),
"LLC_webcam2": ({'source': 'SCS_CDILLC_VAC/CAM/WEBCAMERA2:daqOutput',
'key': 'data.image.pixels',
'dim': ['llc2_y', 'llc2_x']},),
+ "LLC_webcam1": ({'source': 'SCS_CDILLC_VAC/CAM/WEBCAMERA1:daqOutput',
+ 'key': 'data.image.pixels',
+ 'dim': ['llc1_y', 'llc1_x']},),
+
+ # PI-MTE3 CCD camera
+ "MTE3": ({'source': 'SCS_CDIDET_MTE3/CAM/CAMERA:daqOutput',
+ 'key': 'data.image.pixels',
+ 'dim': ['x', 'y']},),
+
+ # Andor Newton CCD camera
+ "newton": ({'source': 'SCS_EXP_NEWTON/CAM/CAMERA:daqOutput',
+ 'key': 'data.image.pixels',
+ 'dim': ['newt_y', 'newt_x']},),
# FastCCD, if in raw folder, raw images
# if in proc folder, dark substracted and relative gain corrected
--
GitLab