diff --git a/src/toolbox_scs/constants.py b/src/toolbox_scs/constants.py index 64b2180adf4d75afec2ac3145ac743ef6d363f90..2436daca23dbcf163ef7566af0e8b2d7db15640b 100644 --- a/src/toolbox_scs/constants.py +++ b/src/toolbox_scs/constants.py @@ -273,14 +273,14 @@ mnemonics = { "VFM_BENDERF": ({'source': 'SCS_KBS_VFM/MOTOR/BENDERF', '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},), + 'dim': None},), # AFS LASER "AFS_PhaseShifter": ({'source': 'SCS_ILH_LAS/PHASESHIFTER/DOOCS', @@ -361,11 +361,11 @@ mnemonics = { 'key': 'value.value', 'dim': None},), "SAM-Z-MOT": ({'source': 'SCS_CDIFFT_MOV/MOTOR/SAM_Z', - 'key': 'actualPosition.value', - 'dim': None},), + 'key': 'actualPosition.value', + 'dim': None},), "SAM-Z": ({'source': 'SCS_CDIFFT_MOV/ENC/SAM_Z', 'key': 'value.value', - 'dim': None},), + 'dim': None},), "magnet": ({'source': 'SCS_CDIFFT_MAG/ASENS/PSU_CMON', 'key': 'value.value', 'dim': None}, @@ -379,8 +379,8 @@ mnemonics = { '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']},), + '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']},), @@ -389,7 +389,12 @@ mnemonics = { "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 "fastccd": ({'source': 'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',