From 3b9eacc72bbe9aa81a9ab4dfa4ab850cd9ef86f4 Mon Sep 17 00:00:00 2001
From: Laurent Mercadier <laurent.mercadier@xfel.eu>
Date: Fri, 21 Oct 2022 00:06:44 +0200
Subject: [PATCH] Add extract_fadc2 parameter in load() function
---
src/toolbox_scs/load.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/toolbox_scs/load.py b/src/toolbox_scs/load.py
index fc2f771..e650be5 100644
--- a/src/toolbox_scs/load.py
+++ b/src/toolbox_scs/load.py
@@ -42,6 +42,7 @@ def load(proposalNB=None, runNB=None,
rois={},
extract_adq412=True,
extract_fadc=True,
+ extract_fadc2=True,
extract_xgm=True,
extract_bam=True,
adq412_bp='sase3',
@@ -94,6 +95,10 @@ def load(proposalNB=None, runNB=None,
If True, extracts the peaks from FastADC variables (e.g. 'FastADC5raw',
'FastADC3peaks') and aligns the pulse Id according to the fadc_bp bunch
pattern.
+ extract_fadc2: bool
+ If True, extracts the peaks from FastADC2 variables (e.g. 'FastADC2_5raw',
+ 'FastADC2_3peaks') and aligns the pulse Id according to the fadc2_bp bunch
+ pattern.
extract_xgm: bool
If True, extracts the values from XGM variables (e.g. 'SCS_SA3',
'XTD10_XGM') and aligns the pulse Id with the sase1 / sase3 bunch
@@ -227,7 +232,7 @@ def load(proposalNB=None, runNB=None,
data = tbdet.get_digitizer_peaks(run, mnemonics=fadc, merge_with=data,
bunchPattern=fadc_bp)
fadc2 = [k for k in run_mnemonics if 'FastADC2_' in k and k in data]
- if extract_fadc and len(fadc2) > 0:
+ if extract_fadc2 and len(fadc2) > 0:
data = tbdet.get_digitizer_peaks(run, mnemonics=fadc2, merge_with=data,
bunchPattern=fadc2_bp)
--
GitLab