diff --git a/src/toolbox_scs/constants.py b/src/toolbox_scs/constants.py
index f364dc23239519421dd6005e0ef6eff0a525ff41..0f521b44a5fedd80a2c9e3f6fbbf9dedf23a03d1 100644
--- a/src/toolbox_scs/constants.py
+++ b/src/toolbox_scs/constants.py
@@ -193,54 +193,54 @@ mnemonics = {
                 'dim': None},),
     
     # PES
-    "PES_N_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                   'key': 'digitizers.channel_4_A.raw.samples',
-                   'dim': ['PESsampleId']},),
-    "PES_NNE_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                     'key': 'digitizers.channel_4_B.raw.samples',
-                     'dim': ['PESsampleId']},),
-    "PES_NE_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                    'key': 'digitizers.channel_4_C.raw.samples',
-                    'dim': ['PESsampleId']},),
-    "PES_ENE_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                     'key': 'digitizers.channel_4_D.raw.samples',
-                     'dim': ['PESsampleId']},),
-    "PES_E_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                   'key': 'digitizers.channel_3_A.raw.samples',
-                   'dim': ['PESsampleId']},),
-    "PES_ESE_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                     'key': 'digitizers.channel_3_B.raw.samples',
-                     'dim': ['PESsampleId']},),
-    "PES_SE_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                    'key': 'digitizers.channel_3_C.raw.samples',
-                    'dim': ['PESsampleId']},),
-    "PES_SSE_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
-                     'key': 'digitizers.channel_3_D.raw.samples',
-                     'dim': ['PESsampleId']},),
-    "PES_S_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_1Araw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                    'key': 'digitizers.channel_1_A.raw.samples',
                    'dim': ['PESsampleId']},),
-    "PES_SSW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_1Braw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                      'key': 'digitizers.channel_1_B.raw.samples',
                      'dim': ['PESsampleId']},),
-    "PES_SW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_1Craw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                     'key': 'digitizers.channel_1_C.raw.samples',
                     'dim': ['PESsampleId']},),
-    "PES_WSW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_1Draw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                      'key': 'digitizers.channel_1_D.raw.samples',
                      'dim': ['PESsampleId']},),
-    "PES_W_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_2Araw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                    'key': 'digitizers.channel_2_A.raw.samples',
                    'dim': ['PESsampleId']},),
-    "PES_WNW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_2Braw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                      'key': 'digitizers.channel_2_B.raw.samples',
                      'dim': ['PESsampleId']},),
-    "PES_NW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_2Craw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                     'key': 'digitizers.channel_2_C.raw.samples',
                     'dim': ['PESsampleId']},),
-    "PES_NNW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+    "PES_2Draw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
                      'key': 'digitizers.channel_2_D.raw.samples',
                      'dim': ['PESsampleId']},),
+    "PES_4Araw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                   'key': 'digitizers.channel_4_A.raw.samples',
+                   'dim': ['PESsampleId']},),
+    "PES_4Braw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                     'key': 'digitizers.channel_4_B.raw.samples',
+                     'dim': ['PESsampleId']},),
+    "PES_4Craw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                    'key': 'digitizers.channel_4_C.raw.samples',
+                    'dim': ['PESsampleId']},),
+    "PES_4Draw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                     'key': 'digitizers.channel_4_D.raw.samples',
+                     'dim': ['PESsampleId']},),
+    "PES_3Aaw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                   'key': 'digitizers.channel_3_A.raw.samples',
+                   'dim': ['PESsampleId']},),
+    "PES_3Braw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                     'key': 'digitizers.channel_3_B.raw.samples',
+                     'dim': ['PESsampleId']},),
+    "PES_3Craw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                    'key': 'digitizers.channel_3_C.raw.samples',
+                    'dim': ['PESsampleId']},),
+    "PES_3Draw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+                     'key': 'digitizers.channel_3_D.raw.samples',
+                     'dim': ['PESsampleId']},),
     "PES_pressure": ({'source': 'SA3_XTD10_PES/GAUGE/G30310F',
                       'key': 'value.value',
                       'dim': None},),
@@ -452,6 +452,9 @@ mnemonics = {
                         {'source': 'SCS_ILH_LAS/MOTOR/LT3',
                          'key': 'AActualPosition.value',
                          'dim': None},),
+    "PP800_T0_mm": ({'source': 'SCS_ILH_LAS/MDL/OPTICALDELAY_PP800',
+                     'key': 'motorOffset.value',
+                     'dim': None},),
     "PP800_HalfWP": ({'source': 'SCS_ILH_LAS/MOTOR/ROT8WP1',
                       'key': 'actualPosition.value',
                       'dim': None},),
@@ -1112,6 +1115,14 @@ mnemonics = {
                           'key': 'data.rawData',
                           'dim': ['mcpbig_samplesId'],
                           'extract': 'peaks'},),
+    "XRD_PD2raw": ({'source': 'SCS_XRD_DET/ADC/DIODE2:output',
+                    'key': 'data.rawData',
+                    'dim': ['pd2_samplesId'],
+                    'extract': 'peaks'},),
+    "XRD_PD6raw": ({'source': 'SCS_XRD_DET/ADC/DIODE6:output',
+                    'key': 'data.rawData',
+                    'dim': ['pd6_samplesId'],
+                    'extract': 'peaks'},),
 
     # KARABACON
     "KARABACON": ({'source': 'SCS_DAQ_SCAN/MDL/KARABACON',
@@ -1125,16 +1136,22 @@ mnemonics = {
     "Gotthard2": ({'source': 'SCS_PAM_XOX/DET/GOTTHARD_RECEIVER2:daqOutput',
                    'key': 'data.adc',
                    'dim': ['gott_pId', 'pixelId']},),
-    "GH21": ({'source': 'SCS_XOX_GH21/CORR/GOTTHARD2_RECEIVER1:daqOutput',
+    "GH21": ({'source': 'SCS_XOX_GH21/CORR/RECEIVER:daqOutput',
+              'key': 'data.adc',
+              'dim': ['gh2_pId', 'pixelId']},
+             {'source': 'SCS_XOX_GH21/CORR/GOTTHARD2_RECEIVER1:daqOutput',
               'key': 'data.adc',
               'dim': ['gh2_pId', 'pixelId']},),
-    "GH22": ({'source': 'SCS_XOX_GH22/CORR/GOTTHARD2_RECEIVER1:daqOutput',
+    "GH22": ({'source': 'SCS_XOX_GH22/CORR/RECEIVER:daqOutput',
+              'key': 'data.adc',
+              'dim': ['gh2_pId', 'pixelId']},
+             {'source': 'SCS_XOX_GH22/CORR/GOTTHARD2_RECEIVER2:daqOutput',
               'key': 'data.adc',
               'dim': ['gh2_pId', 'pixelId']},),
     "GH21_raw": ({'source': 'SCS_XOX_GH21/DET/GOTTHARD2_RECEIVER1:daqOutput',
                   'key': 'data.adc',
                   'dim': ['gh2_pId', 'pixelId']},),
-    "GH22_raw": ({'source': 'SCS_XOX_GH22/DET/GOTTHARD2_RECEIVER1:daqOutput',
+    "GH22_raw": ({'source': 'SCS_XOX_GH22/DET/GOTTHARD2_RECEIVER2:daqOutput',
                   'key': 'data.adc',
                   'dim': ['gh2_pId', 'pixelId']},),