Skip to content
Snippets Groups Projects
Verified Commit f81e13ba authored by Tobias Hangleiter's avatar Tobias Hangleiter
Browse files

Change noverlap bounds from nperseg//2 to nperseg-1

parent 253b740d
No related branches found
No related tags found
1 merge request!17noverlap bounds
Pipeline #1029959 waiting for manual action
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment