Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
ToolBox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SCS
ToolBox
Commits
51e79fd1
Commit
51e79fd1
authored
5 years ago
by
Laurent Mercadier
Browse files
Options
Downloads
Patches
Plain Diff
source argument can be used to give name of peak Id dimension
parent
fcb27cf7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!78
ol_pId
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xgm.py
+3
-3
3 additions, 3 deletions
xgm.py
with
3 additions
and
3 deletions
xgm.py
+
3
−
3
View file @
51e79fd1
...
@@ -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
'
,
u
sed to give name to the peak Id dimension.
or any name. U
sed 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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment