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
a8440cd9
Commit
a8440cd9
authored
1 month ago
by
Tobias Hangleiter
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotifx/mfli' into 'main'
Fix mfli driver See merge request
!74
parents
bc0aea9a
3e7ecb4e
No related branches found
No related tags found
No related merge requests found
Pipeline
#1711831
passed
1 month ago
Stage: deploy
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/python_spectrometer/daq/zurich_instruments.py
+3
-1
3 additions, 1 deletion
src/python_spectrometer/daq/zurich_instruments.py
with
3 additions
and
1 deletion
src/python_spectrometer/daq/zurich_instruments.py
+
3
−
1
View file @
a8440cd9
...
@@ -194,7 +194,7 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice):
...
@@ -194,7 +194,7 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice):
``freq = 10e3, f_max = 2e3``, the spectrum will have a
``freq = 10e3, f_max = 2e3``, the spectrum will have a
bandwidth of ``[8e3, 12e3]``.
bandwidth of ``[8e3, 12e3]``.
**settings : Mapping
**settings : Mapping
Additional settings for data acqusition.
Additional settings for data acqu
i
sition.
Notes
Notes
-----
-----
...
@@ -237,6 +237,8 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice):
...
@@ -237,6 +237,8 @@ class ZurichInstrumentsMFLIDAQ(_ZurichInstrumentsDevice):
if
filter_order
is
not
None
:
if
filter_order
is
not
None
:
self
.
device
.
demods
[
self
.
demod
].
order
(
int
(
filter_order
))
self
.
device
.
demods
[
self
.
demod
].
order
(
int
(
filter_order
))
settings
=
settings
.
to_consistent_dict
()
# BW 3dB = √(2^(1/n) - 1) / 2πτ
# BW 3dB = √(2^(1/n) - 1) / 2πτ
# BW NEP = Γ(n - 1/2) / 4τ √(π)Γ(n)
# BW NEP = Γ(n - 1/2) / 4τ √(π)Γ(n)
n
=
self
.
device
.
demods
[
self
.
demod
].
order
()
n
=
self
.
device
.
demods
[
self
.
demod
].
order
()
...
...
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