Skip to content
Snippets Groups Projects

Fix warning condition for TIM apd

Merged Laurent Mercadier requested to merge tim_warning into master
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
+ 1
1
@@ -573,7 +573,7 @@ def getTIMapd(data, mcp=1, use_apd=True, intstart=None, intstop=None,
@@ -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 ' +
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}.')
f'but XFEL delivered 1 pulse out of {period_from_bunch_pattern}.')
maxPulses = data['npulses_sase3'].max().values
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 ' +
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')
f'too low ({pulseIdDim})to record the {maxPulses} SASE 3 pulses')
peaks = data[f'MCP{mcp}apd']
peaks = data[f'MCP{mcp}apd']
Loading