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
f81e13ba
Verified
Commit
f81e13ba
authored
Jul 4, 2023
by
Tobias Hangleiter
Browse files
Options
Downloads
Patches
Plain Diff
Change noverlap bounds from nperseg//2 to nperseg-1
parent
253b740d
No related branches found
No related tags found
1 merge request
!17
noverlap bounds
Pipeline
#1029959
waiting for manual action
Stage: test
Changes
1
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/python_spectrometer/daq/settings.py
+2
-2
2 additions, 2 deletions
src/python_spectrometer/daq/settings.py
with
2 additions
and
2 deletions
src/python_spectrometer/daq/settings.py
+
2
−
2
View file @
f81e13ba
...
@@ -525,7 +525,7 @@ class DAQSettings(dict):
...
@@ -525,7 +525,7 @@ class DAQSettings(dict):
return
self
.
get
(
'
f_max
'
,
self
.
_infer_f_max
())
or
inf
return
self
.
get
(
'
f_max
'
,
self
.
_infer_f_max
())
or
inf
def
_lower_bound_nperseg
(
self
)
->
int
:
def
_lower_bound_nperseg
(
self
)
->
int
:
return
floor
(
2
*
(
self
.
get
(
'
noverlap
'
,
self
.
_infer_noverlap
())
or
0.5
))
return
self
.
get
(
'
noverlap
'
,
0
)
+
1
def
_upper_bound_nperseg
(
self
)
->
int
|
float
:
def
_upper_bound_nperseg
(
self
)
->
int
|
float
:
return
self
.
get
(
'
n_pts
'
,
self
.
_domain_n_pts
.
max
())
return
self
.
get
(
'
n_pts
'
,
self
.
_domain_n_pts
.
max
())
...
@@ -541,7 +541,7 @@ class DAQSettings(dict):
...
@@ -541,7 +541,7 @@ class DAQSettings(dict):
def
_upper_bound_noverlap
(
self
)
->
int
|
float
:
def
_upper_bound_noverlap
(
self
)
->
int
|
float
:
ub_nperseg
=
self
.
_domain_nperseg
.
max
()
ub_nperseg
=
self
.
_domain_nperseg
.
max
()
nperseg
=
self
.
get
(
'
nperseg
'
,
self
.
_infer_nperseg
())
or
ub_nperseg
nperseg
=
self
.
get
(
'
nperseg
'
,
self
.
_infer_nperseg
())
or
ub_nperseg
bound
=
nperseg
//
2
bound
=
nperseg
-
1
if
not
isinf
(
ub_nperseg
)
and
'
n_seg
'
in
self
:
if
not
isinf
(
ub_nperseg
)
and
'
n_seg
'
in
self
:
return
min
(
bound
,
nperseg
-
(
ub_nperseg
-
nperseg
)
//
self
[
'
n_seg
'
])
return
min
(
bound
,
nperseg
-
(
ub_nperseg
-
nperseg
)
//
self
[
'
n_seg
'
])
return
bound
return
bound
...
...
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