Merge branch 'SAM-Z' into 'master'

sam-z-motor

See merge request !124

src/toolbox_scs/constants.py

@@ -360,9 +360,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',
+    "SAM-Z": ({'source': 'SCS_CDIFFT_MOV/MOTOR/SAM_Z',
+               'key': 'actualPosition.value',
                'dim': None},),
+    "SAM-Z-MOT": ({'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},
@@ -380,7 +383,7 @@ mnemonics = {
                      'dim': ['llc2_y', 'llc2_x']},),
 
     # PI-MTE3 CCD camera
-    "MTE3": ({'source': 'SCS_CDIFFT_MTE3/CAM/CAMERA:daqOutput',
+    "MTE3": ({'source': 'SCS_CDIDET_MTE3/CAM/CAMERA:daqOutput',
               'key': 'data.image.pixels',
               'dim': ['x', 'y']},),