Skip to content
Snippets Groups Projects
Commit 51e79fd1 authored by Laurent Mercadier's avatar Laurent Mercadier
Browse files

source argument can be used to give name of peak Id dimension

parent fcb27cf7
No related branches found
No related tags found
1 merge request!78ol_pId
...@@ -834,8 +834,8 @@ def fastAdcPeaks(data, channel, intstart, intstop, bkgstart, bkgstop, ...@@ -834,8 +834,8 @@ def fastAdcPeaks(data, channel, intstart, intstop, bkgstart, bkgstop,
two bunches @ 4.5 MHz. two bunches @ 4.5 MHz.
npulses: number of pulses. If None, takes the maximum number of npulses: number of pulses. If None, takes the maximum number of
pulses according to the bunch patter (field 'npulses_sase3') pulses according to the bunch patter (field 'npulses_sase3')
source: str, nature of the pulses: 'sase[1,2 or 3]', or 'scs_ppl', source: str, nature of the pulses, 'sase[1,2 or 3]', or 'scs_ppl',
used to give name to the peak Id dimension. or any name. Used to give name to the peak Id dimension.
usePeakValue: bool, if True takes the peak value of the signal, usePeakValue: bool, if True takes the peak value of the signal,
otherwise integrates over integration region. otherwise integrates over integration region.
peakType: str, 'pos' or 'neg'. Used if usePeakValue is True to peakType: str, 'pos' or 'neg'. Used if usePeakValue is True to
...@@ -864,7 +864,7 @@ def fastAdcPeaks(data, channel, intstart, intstop, bkgstart, bkgstop, ...@@ -864,7 +864,7 @@ def fastAdcPeaks(data, channel, intstart, intstop, bkgstart, bkgstop,
period = 24 * step period = 24 * step
else: else:
period = 1 period = 1
pulseId = 'peakId' pulseId = source
if source=='scs_ppl': if source=='scs_ppl':
pulseId = 'ol_pId' pulseId = 'ol_pId'
if 'sase' in source: if 'sase' in source:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment