Measurement.fromnpy(): accept sensitivity as scalar or 0-dim numpy.ndarray

cpp_src/device/CMakeLists.txt

@@ -10,6 +10,10 @@ add_library(lasp_device_lib OBJECT
     lasp_rtaudiodaq.cpp
     lasp_streammgr.cpp
     lasp_indatahandler.cpp
+    lasp_uldaq.cpp
+    uldaq/lasp_uldaq_impl.cpp
+    uldaq/lasp_uldaq_bufhandler.cpp
+    uldaq/lasp_uldaq_common.cpp
     portaudio/lasp_portaudiodaq.cpp
     )
 
@@ -24,9 +28,7 @@ target_include_directories(lasp_device_lib INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(LASP_HAS_ULDAQ)
-    add_subdirectory(uldaq)
-    target_include_directories(lasp_device_lib INTERFACE uldaq)
-    target_link_libraries(lasp_device_lib uldaq_backend uldaq)
+    target_link_libraries(lasp_device_lib uldaq)
 endif()
 if(LASP_HAS_RTAUDIO)
     target_link_libraries(lasp_device_lib rtaudio)

cpp_src/device/uldaq/CMakeLists.txt

@@ -1,6 +0,0 @@
-
-add_library(uldaq_backend lasp_uldaq.cpp lasp_uldaq_bufhandler.cpp lasp_uldaq_common.cpp lasp_uldaq_impl.cpp)
-target_include_directories(uldaq_backend PUBLIC ../)
-target_include_directories(uldaq_backend PUBLIC ../../)
-target_include_directories(uldaq_backend PUBLIC ../../dsp)
-target_include_directories(uldaq_backend INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

cpp_src/device/uldaq/lasp_uldaq_common.cpp

@@ -3,8 +3,8 @@
 #include "lasp_config.h"
 
 #if LASP_HAS_ULDAQ == 1
-#include "lasp_daq.h"
 #include "lasp_uldaq_common.h"
+#include "lasp_daq.h"
 
 string getErrMsg(UlError err) {
   string errstr;
@@ -21,9 +21,11 @@ void showErr(string errstr) {
   std::cerr << "***********************************************\n\n";
 }
 void showErr(UlError err) {
-  if (err != ERR_NO_ERROR) showErr(getErrMsg(err));
+  if (err != ERR_NO_ERROR)
+    showErr(getErrMsg(err));
 }
 
+
 void throwOnPossibleUlException(UlError err) {
   if (err == ERR_NO_ERROR) {
     return;

python_src/lasp/__init__.py

@@ -10,11 +10,11 @@ from .lasp_cpp import *
 
 # from .lasp_imptube import *  # TwoMicImpedanceTube
 from .lasp_measurement import *  # Measurement, scaleBlockSens
-from .lasp_octavefilter import *
+from .lasp_octavefilter import *  # OverallFilterBank, SosOctaveFilterBank, SosThirdOctaveFilterBank
 from .lasp_slm import *  # SLM, Dummy
 from .lasp_record import *  # RecordStatus, Recording
-from .lasp_daqconfigs import *
-from .lasp_measurementset import *
+from .lasp_daqconfigs import *  # DaqConfigurations
+from .lasp_measurementset import *  # MeasurementSet
 
 # from .lasp_siggen import *  # SignalType, NoiseType, SiggenMessage, SiggenData, Siggen
 # from .lasp_weighcal import *  # WeighCal

python_src/lasp/filter/filterbank_design.py

@@ -15,7 +15,6 @@ import warnings
 import numpy as np
 # For designing second-order sections
 from scipy.signal import butter
-from ..lasp_config import LASP_NUMPY_FLOAT_TYPE
 
 from .fir_design import bandpass_fir_design
 from .fir_design import freqResponse as firFreqResponse
@@ -255,9 +254,9 @@ class FilterBankDesigner:
         fuu = self.fu(xu)
 
         if scale == 'lin':
-            freq = np.linspace(fll, fuu, npoints, dtype=LASP_NUMPY_FLOAT_TYPE)
+            freq = np.linspace(fll, fuu, npoints)
         elif scale == 'log':
-            freq = np.logspace(np.log10(fll), np.log10(fuu), npoints, dtype=LASP_NUMPY_FLOAT_TYPE)
+            freq = np.logspace(np.log10(fll), np.log10(fuu), npoints)
         else:
             raise ValueError(f'Invalid scale parameter: {scale}')
 

python_src/lasp/lasp_common.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from dataclasses_json import dataclass_json
 from enum import Enum, unique, auto
 from .lasp_cpp import DaqChannel
-from .lasp_config import LASP_NUMPY_FLOAT_TYPE
 
 """
 Common definitions used throughout the code.
@@ -396,9 +395,7 @@ def getTime(fs, N, start=0):
         start: Optional start ofset in number of samples
     """
     assert N > 0 and fs > 0
-    return np.linspace(
-        start, start + N / fs, N, endpoint=False, dtype=LASP_NUMPY_FLOAT_TYPE
-    )
+    return np.linspace(start, start + N/fs, N, endpoint=False)
 
 
 def getFreq(fs, nfft):
@@ -411,4 +408,4 @@ def getFreq(fs, nfft):
     """
     df = fs/nfft   # frequency resolution
     K = nfft//2+1  # number of frequency bins
-    return np.linspace(0, (K - 1) * df, K, dtype=LASP_NUMPY_FLOAT_TYPE)
+    return np.linspace(0, (K-1)*df, K)

python_src/lasp/lasp_config.py

@@ -5,12 +5,9 @@ Author: J.A. de Jong - ASCEE
 
 Description: LASP configuration
 """
-
 import numpy as np
 from .lasp_cpp import LASP_DOUBLE_PRECISION
 
-__all__ = ["zeros", "ones", "empty", "LASP_NUMPY_FLOAT_TYPE", "LASP_NUMPY_COMPLEX_TYPE"]
-
 if LASP_DOUBLE_PRECISION:
     LASP_NUMPY_FLOAT_TYPE = np.float64
     LASP_NUMPY_COMPLEX_TYPE = np.complex128
@@ -19,28 +16,28 @@ else:
     LASP_NUMPY_COMPLEX_TYPE = np.float64
 
 
-def zeros(shape, dtype=float, order="F"):
-    if dtype is float:
+def zeros(shape, dtype=float, order='F'):
+    if dtype == float:
         return np.zeros(shape, dtype=LASP_NUMPY_FLOAT_TYPE, order=order)
-    elif dtype is complex:
+    elif dtype == complex:
         return np.zeros(shape, dtype=LASP_NUMPY_COMPLEX_TYPE, order=order)
     else:
         raise RuntimeError(f"Unknown dtype: {dtype}")
 
 
-def ones(shape, dtype=float, order="F"):
-    if dtype is float:
+def ones(shape, dtype=float, order='F'):
+    if dtype == float:
         return np.ones(shape, dtype=LASP_NUMPY_FLOAT_TYPE, order=order)
-    elif dtype is complex:
+    elif dtype == complex:
         return np.ones(shape, dtype=LASP_NUMPY_COMPLEX_TYPE, order=order)
     else:
         raise RuntimeError(f"Unknown dtype: {dtype}")
 
-
-def empty(shape, dtype=float, order="F"):
-    if dtype is float:
+def empty(shape, dtype=float, order='F'):
+    if dtype == float:
         return np.empty(shape, dtype=LASP_NUMPY_FLOAT_TYPE, order=order)
-    elif dtype is complex:
+    elif dtype == complex:
         return np.empty(shape, dtype=LASP_NUMPY_COMPLEX_TYPE, order=order)
     else:
         raise RuntimeError(f"Unknown dtype: {dtype}")
+

python_src/lasp/lasp_measurement.py

@@ -1156,11 +1156,8 @@ class Measurement:
         if data.ndim != 2:
             data = data[:, np.newaxis]
 
-        try:
-            len(sensitivity)
-        except:
-            raise ValueError("Sensitivity should be given as array-like data type")
-        sensitivity = np.asarray(sensitivity)
+        if not (isinstance(sensitivity, np.ndarray) and sensitivity.ndim >= 1):
+            sensitivity = np.asarray(sensitivity)[np.newaxis]
 
         nchannels = data.shape[1]
         if nchannels != sensitivity.shape[0]:

python_src/lasp/lasp_octavefilter.py

@@ -11,7 +11,6 @@ __all__ = ["OverallFilterBank", "SosOctaveFilterBank", "SosThirdOctaveFilterBank
 
 from .filter.filterbank_design import OctaveBankDesigner, ThirdOctaveBankDesigner
 from .lasp_cpp import BiquadBank
-from .lasp_config import empty, LASP_NUMPY_FLOAT_TYPE
 import numpy as np
 
 
@@ -47,7 +46,7 @@ class OverallFilterBank:
         Ncur = data.shape[0]
         tend = tstart + Ncur / self.fs
 
-        t = np.linspace(tstart, tend, Ncur, endpoint=False, dtype=LASP_NUMPY_FLOAT_TYPE)
+        t = np.linspace(tstart, tend, Ncur, endpoint=False)
         self.N += Ncur
 
         output["Overall"] = {"t": t, "data": data, "x": 0}
@@ -115,7 +114,7 @@ class SosFilterBank:
         Ncur = data.shape[0]
         tend = tstart + Ncur / self.fs
 
-        t = np.linspace(tstart, tend, Ncur, endpoint=False, dtype=LASP_NUMPY_FLOAT_TYPE)
+        t = np.linspace(tstart, tend, Ncur, endpoint=False)
         self.N += Ncur
 
         for i, x in enumerate(self.xs):

python_src/lasp/lasp_slm.py

@@ -4,15 +4,14 @@
 Sound level meter implementation
 @author: J.A. de Jong - ASCEE
 """
-
 from .lasp_cpp import cppSLM
-from .lasp_config import empty, LASP_NUMPY_FLOAT_TYPE
+from .lasp_config import empty
 import numpy as np
-from .lasp_common import TimeWeighting, FreqWeighting, P_REF
+from .lasp_common import (TimeWeighting, FreqWeighting, P_REF)
 from .filter import SPLFilterDesigner
 import logging
 
-__all__ = ["SLM", "Dummy"]
+__all__ = ['SLM', 'Dummy']
 
 
 class Dummy:
@@ -90,7 +89,7 @@ class SLM:
         elif fw == FreqWeighting.Z:
             prefilter = None
         else:
-            raise ValueError(f"Not implemented prefilter {fw}")
+            raise ValueError(f'Not implemented prefilter {fw}')
 
         # 'Probe' size of filter coefficients
         self.nom_txt = []
@@ -103,7 +102,7 @@ class SLM:
             assert fbdesigner.fs == fs
             sos_firstx = fbdesigner.createSOSFilter(self.xs[0]).flatten()
             self.nom_txt.append(fbdesigner.nominal_txt(self.xs[0]))
-            sos = empty((sos_firstx.size, nfilters), dtype=float, order="C")
+            sos = empty((sos_firstx.size, nfilters), dtype=float, order='C')
             sos[:, 0] = sos_firstx
 
             for i, x in enumerate(self.xs[1:]):

python_src/lasp/lasp_weighcal.py

@@ -7,7 +7,6 @@ Weighting and calibration filter in one
 from .lasp_common import FreqWeighting
 from .filter import SPLFilterDesigner
 from lasp.lasp_config import ones, empty
-from ..lasp_config import LASP_NUMPY_FLOAT_TYPE
 from .wrappers import FilterBank
 import numpy as np
 
@@ -40,7 +39,7 @@ class WeighCal:
         self.calfile = calfile
 
         # Frequencies used for the filter design
-        freq_design = np.linspace(0, 17e3, 3000, dtype=LASP_NUMPY_FLOAT_TYPE)
+        freq_design = np.linspace(0, 17e3, 3000)
         freq_design[-1] = fs/2
 
         # Objective function for the frequency response
@@ -141,7 +140,6 @@ class WeighCal:
         """
         Returns the frequency response of the designed FIR filter
         """
-        raise RuntimeError('This code bugs. TODO: Re-implement?')
         if freq is None:
             freq = np.logspace(1, np.log10(self.fs/2), 500)
         return (freq, frp(self.fs, freq, self._firs[chan]),