ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop

Browse Source
This commit is contained in:
Anne de Jong 2021-05-23 22:54:04 +02:00
commit ea14ce9699
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lasp/lasp_avstream.py
View File

@ -157,6 +157,14 @@ class AudioStream:
return 1 return 1
self.aframectr += 1 self.aframectr += 1
# TODO: Fix this. This gives bug on Windows, the threading lock does
# give a strange erro.
try:
if not self.running():
return 1
except Exception as e:
print(e)
rv = self.processCallback(self, indata, outdata) rv = self.processCallback(self, indata, outdata)
if rv != 0: if rv != 0:
self.running <<= False self.running <<= False

2
lasp/lasp_measurement.py
View File

@ -246,7 +246,7 @@ class Measurement:
except KeyError: except KeyError:
# If quantity data is not available, this is an 'old' # If quantity data is not available, this is an 'old'
# measurement file. # measurement file.
logging.debug('Physical quantity data not available in measurement file. Assuming {SIQtys.default}') logging.debug(f'Physical quantity data not available in measurement file. Assuming {SIQtys.default}')
self._qtys = [SIQtys.default for i in range(self.nchannels)] self._qtys = [SIQtys.default for i in range(self.nchannels)]
def setAttribute(self, atrname, value): def setAttribute(self, atrname, value):

1
lasp/tools/tools.py
View File

@ -84,6 +84,7 @@ def smoothSpectralData(freq, M, sw: SmoothingWidth,
assert Noct > 0, "'Noct' must be absolute positive" assert Noct > 0, "'Noct' must be absolute positive"
if Noct < 1: raise Warning('Check if \'Noct\' is entered correctly') if Noct < 1: raise Warning('Check if \'Noct\' is entered correctly')
assert len(freq)==len(M), 'f and M should have equal length' assert len(freq)==len(M), 'f and M should have equal length'
if st == SmoothingType.ps: if st == SmoothingType.ps:
assert np.min(M) >= 0, 'absolute magnitude M cannot be negative' assert np.min(M) >= 0, 'absolute magnitude M cannot be negative'
if st == SmoothingType.levels and isinstance(M.dtype, complex): if st == SmoothingType.levels and isinstance(M.dtype, complex):