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
Commits
849ff557
Commit
849ff557
authored
2 years ago
by
Tobias Hangleiter
Browse files
Options
Downloads
Patches
Plain Diff
Type hints and formatting
parent
64d89968
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!15
Move daq/domains.py to qutil
,
!13
Alazar driver (config2)
Pipeline
#1029962
waiting for manual action
Stage: test
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/python_spectrometer/daq/settings.py
+9
-9
9 additions, 9 deletions
src/python_spectrometer/daq/settings.py
tests/test_daq_settings.py
+2
-2
2 additions, 2 deletions
tests/test_daq_settings.py
with
11 additions
and
11 deletions
src/python_spectrometer/daq/settings.py
+
9
−
9
View file @
849ff557
...
...
@@ -266,17 +266,17 @@ class DAQSettings(dict):
# Override these to constrain parameters to certain sets allowed by hardware. An empty set
# means no restrictions.
ALLOWED_FS
:
BoundedSet
[
float
]
|
Interval
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_DF
:
BoundedSet
[
float
]
|
Interval
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_F_MAX
:
BoundedSet
[
float
]
|
Interval
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_F_MIN
:
BoundedSet
[
float
]
|
Interval
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_NOVERLAP
:
BoundedSet
[
int
]
|
Interval
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_N_PTS
:
BoundedSet
[
int
]
|
Interval
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_N_SEG
:
BoundedSet
[
int
]
|
Interval
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_N_AVG
:
BoundedSet
[
int
]
|
Interval
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_FS
:
Domain
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_DF
:
Domain
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_F_MAX
:
Domain
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_F_MIN
:
Domain
[
float
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_NOVERLAP
:
Domain
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_N_PTS
:
Domain
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_N_SEG
:
Domain
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
ALLOWED_N_AVG
:
Domain
[
int
]
=
BoundedSet
(
precision
=
PRECISION
)
@property
def
ALLOWED_NPERSEG
(
self
)
->
BoundedSet
[
int
]
|
Interval
[
int
]:
def
ALLOWED_NPERSEG
(
self
)
->
Domain
[
int
]:
return
self
.
ALLOWED_N_PTS
def
_lower_bound_fs
(
self
)
->
float
:
...
...
This diff is collapsed.
Click to expand it.
tests/test_daq_settings.py
+
2
−
2
View file @
849ff557
...
...
@@ -3,8 +3,8 @@ from unittest.mock import MagicMock
import
pytest
from
python_spectrometer.daq
import
DAQSettings
from
python_spectrometer.daq.settings
import
ResolutionError
from
python_spectrometer.daq.zurich_instruments
import
(
ZurichInstrumentsMFLIDAQ
,
ZurichInstrumentsMFLIScope
)
from
python_spectrometer.daq.zurich_instruments
import
(
ZurichInstrumentsMFLIDAQ
,
ZurichInstrumentsMFLIScope
)
from
qutil
import
itertools
from
zhinst
import
toolkit
...
...
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