diff --git a/doc/changelog.rst b/doc/changelog.rst
index 43cf1a3dc2aa77147d2a492ff48cf9fe3fc0d1eb..28273294d7663d723496072bf327303c168c38de 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -26,6 +26,7 @@ unreleased
- improved function to load PES spectra :mr:`309`
- Gotthard-II mnemonics and pulse alignment :mr:`310`, :mr:`311`
- Adds ``AppleX`` polarization mnemonics :mr:`313`
+ - Add BAM 2955_S3 and update BAM mnemonics :mr:`315`
- **New Features**
diff --git a/src/toolbox_scs/constants.py b/src/toolbox_scs/constants.py
index a59636f9ecdb80687a4e009f4dcf983c9a974440..4d78bcb357428978744a831bbb77b5f784b54af8 100644
--- a/src/toolbox_scs/constants.py
+++ b/src/toolbox_scs/constants.py
@@ -45,7 +45,11 @@ mnemonics = {
'dim': ['pulse_slot']},),
# Bunch Arrival Monitors
- "BAM414": ({'source': 'SCS_ILH_LAS/DOOCS/BAM_414_B2:output',
+ "BAM414": ({'source': 'XFEL_SDIAG_BAM/DOOCS/414_B2:output',
+ 'key': 'data.absoluteTD',
+ 'dim': ['BAMbunchId'],
+ 'extract': 'BAM'},
+ {'source': 'SCS_ILH_LAS/DOOCS/BAM_414_B2:output',
'key': 'data.absoluteTD',
'dim': ['BAMbunchId'],
'extract': 'BAM'},
@@ -53,11 +57,19 @@ mnemonics = {
'key': 'data.lowChargeArrivalTime',
'dim': ['BAMbunchId'],
'extract': 'BAM'},),
- "BAM414_avg": ({'source': 'SCS_ILH_LAS/DOOCS/BAM_414_B2',
+ "BAM414_avg": ({'source': 'XFEL_SDIAG_BAM/DOOCS/414_B2',
+ 'key': 'meanSA3.value',
+ 'dim': None,
+ 'extract': 'BAM'},
+ {'source': 'SCS_ILH_LAS/DOOCS/BAM_414_B2',
'key': 'meanSA3.value',
'dim': None,
'extract': 'BAM'},),
- "BAM1932M": ({'source': 'SCS_ILH_LAS/DOOCS/BAM_1932M_TL:output',
+ "BAM1932M": ({'source': 'XFEL_SDIAG_BAM/DOOCS/1932M_TL:output',
+ 'key': 'data.absoluteTD',
+ 'dim': ['BAMbunchId'],
+ 'extract': 'BAM'},
+ {'source': 'SCS_ILH_LAS/DOOCS/BAM_1932M_TL:output',
'key': 'data.absoluteTD',
'dim': ['BAMbunchId'],
'extract': 'BAM'},
@@ -65,11 +77,19 @@ mnemonics = {
'key': 'data.lowChargeArrivalTime',
'dim': ['BAMbunchId'],
'extract': 'BAM'},),
- "BAM1932M_avg": ({'source': 'SCS_ILH_LAS/DOOCS/BAM_1932M_TL',
+ "BAM1932M_avg": ({'source': 'XFEL_SDIAG_BAM/DOOCS/1932M_TL',
+ 'key': 'meanSA3.value',
+ 'dim': None,
+ 'extract': 'BAM'},
+ {'source': 'SCS_ILH_LAS/DOOCS/BAM_1932M_TL',
'key': 'meanSA3.value',
'dim': None,
'extract': 'BAM'},),
- "BAM1932S": ({'source': 'SCS_ILH_LAS/DOOCS/BAM_1932S_TL:output',
+ "BAM1932S": ({'source': 'XFEL_SDIAG_BAM/DOOCS/1932S_TL:output',
+ 'key': 'data.absoluteTD',
+ 'dim': ['BAMbunchId'],
+ 'extract': 'BAM'},
+ {'source': 'SCS_ILH_LAS/DOOCS/BAM_1932S_TL:output',
'key': 'data.absoluteTD',
'dim': ['BAMbunchId'],
'extract': 'BAM'},
@@ -77,7 +97,19 @@ mnemonics = {
'key': 'data.lowChargeArrivalTime',
'dim': ['BAMbunchId'],
'extract': 'BAM'},),
- "BAM1932S_avg": ({'source': 'SCS_ILH_LAS/DOOCS/BAM_1932S_TL',
+ "BAM1932S_avg": ({'source': 'XFEL_SDIAG_BAM/DOOCS/1932S_TL',
+ 'key': 'meanSA3.value',
+ 'dim': None,
+ 'extract': 'BAM'},
+ {'source': 'SCS_ILH_LAS/DOOCS/BAM_1932S_TL',
+ 'key': 'meanSA3.value',
+ 'dim': None,
+ 'extract': 'BAM'},),
+ "BAM2955_S3": ({'source': 'XFEL_SDIAG_BAM/DOOCS/2955_S3:output',
+ 'key': 'data.absoluteTD',
+ 'dim': ['BAMbunchId'],
+ 'extract': 'BAM'},),
+ "BAM2955_S3_avg": ({'source': 'XFEL_SDIAG_BAM/DOOCS/2955_S3',
'key': 'meanSA3.value',
'dim': None,
'extract': 'BAM'},),
@@ -156,59 +188,56 @@ mnemonics = {
"MAG_CHICANE_DELAY": ({'source': 'SA3_XTD4_CHICANE/DOOCS/SXR2CPP',
'key': 'XFEL_MAGNETS_CHICANE_SXR2CPP.dtFs.value',
'dim': None},),
- "AppleX": ({'source': 'SA3_XTD10_UND/DOOCS/PHOTON_ENERGY',
- 'key': 'actualPolarization.value',
- 'dim': None},),
# PES
- "PES_1Araw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_1_A.raw.samples',
- 'dim': ['PESsampleId']},),
- "PES_1Braw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_1_B.raw.samples',
- 'dim': ['PESsampleId']},),
- "PES_1Craw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_1_C.raw.samples',
- 'dim': ['PESsampleId']},),
- "PES_1Draw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_1_D.raw.samples',
- 'dim': ['PESsampleId']},),
- "PES_2Araw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_2_A.raw.samples',
- 'dim': ['PESsampleId']},),
- "PES_2Braw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_2_B.raw.samples',
- 'dim': ['PESsampleId']},),
- "PES_2Craw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
- 'key': 'digitizers.channel_2_C.raw.samples',
- 'dim': ['PESsampleId']},),
- "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',
+ "PES_N_raw": ({'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',
+ "PES_NNE_raw": ({'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',
+ "PES_NE_raw": ({'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',
+ "PES_ENE_raw": ({'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',
+ "PES_E_raw": ({'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',
+ "PES_ESE_raw": ({'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',
+ "PES_SE_raw": ({'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',
+ "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',
+ 'key': 'digitizers.channel_1_A.raw.samples',
+ 'dim': ['PESsampleId']},),
+ "PES_SSW_raw": ({'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',
+ 'key': 'digitizers.channel_1_C.raw.samples',
+ 'dim': ['PESsampleId']},),
+ "PES_WSW_raw": ({'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',
+ 'key': 'digitizers.channel_2_A.raw.samples',
+ 'dim': ['PESsampleId']},),
+ "PES_WNW_raw": ({'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',
+ 'key': 'digitizers.channel_2_C.raw.samples',
+ 'dim': ['PESsampleId']},),
+ "PES_NNW_raw": ({'source': 'SA3_XTD10_PES/ADC/1:network',
+ 'key': 'digitizers.channel_2_D.raw.samples',
+ 'dim': ['PESsampleId']},),
"PES_pressure": ({'source': 'SA3_XTD10_PES/GAUGE/G30310F',
'key': 'value.value',
'dim': None},),
@@ -420,9 +449,6 @@ 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},),
@@ -1083,14 +1109,6 @@ 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',
@@ -1104,22 +1122,16 @@ mnemonics = {
"Gotthard2": ({'source': 'SCS_PAM_XOX/DET/GOTTHARD_RECEIVER2:daqOutput',
'key': 'data.adc',
'dim': ['gott_pId', 'pixelId']},),
- "GH21": ({'source': 'SCS_XOX_GH21/CORR/RECEIVER:daqOutput',
- 'key': 'data.adc',
- 'dim': ['gh2_pId', 'pixelId']},
- {'source': 'SCS_XOX_GH21/CORR/GOTTHARD2_RECEIVER1:daqOutput',
+ "GH21": ({'source': 'SCS_XOX_GH21/CORR/GOTTHARD2_RECEIVER1:daqOutput',
'key': 'data.adc',
'dim': ['gh2_pId', 'pixelId']},),
- "GH22": ({'source': 'SCS_XOX_GH22/CORR/RECEIVER:daqOutput',
- 'key': 'data.adc',
- 'dim': ['gh2_pId', 'pixelId']},
- {'source': 'SCS_XOX_GH22/CORR/GOTTHARD2_RECEIVER2:daqOutput',
+ "GH22": ({'source': 'SCS_XOX_GH22/CORR/GOTTHARD2_RECEIVER1: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_RECEIVER2:daqOutput',
+ "GH22_raw": ({'source': 'SCS_XOX_GH22/DET/GOTTHARD2_RECEIVER1:daqOutput',
'key': 'data.adc',
'dim': ['gh2_pId', 'pixelId']},),
diff --git a/src/toolbox_scs/detectors/bam_detectors.py b/src/toolbox_scs/detectors/bam_detectors.py
index 783ed2d4b0ee0fa12adcf04c3fa875d45678f1b5..0b071cbfde63f802c10af753469afb15ac4973b0 100644
--- a/src/toolbox_scs/detectors/bam_detectors.py
+++ b/src/toolbox_scs/detectors/bam_detectors.py
@@ -62,7 +62,7 @@ def get_bam(run, mnemonics=None, merge_with=None, bunchPattern='sase3',
>>> run = tb.open_run(2711, 303)
>>> bam = tb.get_bam(run, 'BAM1932S')
"""
- bam_mnemos = ['BAM4', 'BAM1']
+ bam_mnemos = ['BAM4', 'BAM1', 'BAM2']
mnemonics = [mnemonics] if isinstance(mnemonics, str) else mnemonics
m2 = []
for m in mnemonics: