Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
python-spectrometer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
QuTech
python-spectrometer
Merge requests
!48
Draft: channel assignment unsafe hotfix
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Closed
Draft: channel assignment unsafe hotfix
alazar_issues
into
main
Overview
2
Commits
1
Pipelines
2
Changes
1
Closed
Draft: channel assignment unsafe hotfix
Max Oberländer
requested to merge
alazar_issues
into
main
10 months ago
Overview
2
Commits
1
Pipelines
2
Changes
1
0
1
Merge request reports
Compare
main
main (base)
and
latest version
latest version
d7efe581
1 commit,
10 months ago
1 file
+
6
−
1
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/python_spectrometer/daq/atsaverage.py
+
6
−
1
View file @ d7efe581
Edit in single-file editor
Open in Web IDE
Show full file
@@ -111,7 +111,12 @@ class AlazarATS9xx0(DAQ):
@@ -111,7 +111,12 @@ class AlazarATS9xx0(DAQ):
masks
=
[
PeriodicMask
(
"
M
"
,
masks
=
[
PeriodicMask
(
"
M
"
,
begin
=
0
,
end
=
averaged_samples
,
period
=
averaged_samples
,
begin
=
0
,
end
=
averaged_samples
,
period
=
averaged_samples
,
channel
=
self
.
hardware_channel
,
skip
=
0
,
take
=
settings
.
n_pts
)]
#!!! the channel to be inserted in the mask definition does not
# correspond to the 'Channel' from atsaverage.
# The latter is binary-based (A,B,C,D)=(1,2,4,8,),
# the former is integer-0-based (A,B,C,D)=(0,1,2,3),
# -> unsafe hotfix convert for now
channel
=
bin
(
self
.
hardware_channel
).
count
(
'
0
'
)
-
1
,
skip
=
0
,
take
=
settings
.
n_pts
)]
operations
=
[
Downsample
(
'
M
'
,
'
M
'
)]
operations
=
[
Downsample
(
'
M
'
,
'
M
'
)]
board_spec
=
self
.
card
.
get_board_spec
()
board_spec
=
self
.
card
.
get_board_spec
()
Loading