From d001acf0ea2f651824329dab596c06b7f8ea2631 Mon Sep 17 00:00:00 2001
From: Laurent Mercadier <laurent.mercadier@xfel.eu>
Date: Sun, 17 Nov 2019 11:08:51 +0100
Subject: [PATCH] Fix warning condition for TIM apd
---
xgm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xgm.py b/xgm.py
index 61eba7e..59f2dac 100644
--- a/xgm.py
+++ b/xgm.py
@@ -573,7 +573,7 @@ def getTIMapd(data, mcp=1, use_apd=True, intstart=None, intstop=None,
print(f'Warning: apd parameter was set to record 1 pulse out of {period} @ 4.5 MHz ' +
f'but XFEL delivered 1 pulse out of {period_from_bunch_pattern}.')
maxPulses = data['npulses_sase3'].max().values
- if period*pulseIdDim < period_from_bunch_pattern*maxPulses:
+ if period*pulseIdDim < period_from_bunch_pattern*(maxPulses-1):
print(f'Warning: Number of pulses and/or rep. rate in apd parameters were set ' +
f'too low ({pulseIdDim})to record the {maxPulses} SASE 3 pulses')
peaks = data[f'MCP{mcp}apd']
--
GitLab