Merge branch 'master' of https://github.com/Eomys/MoSQITo into master

Author: wantysal

mosqito/classes/Audio.py

@@ -78,8 +78,7 @@ def __init__(self, file, is_stationary=False, calib=1, mat_signal="", mat_fs="")
 
         # Init physical metrics attributes
         self.third_spec = None
-        self.level_db = None
-        self.level_dba = None
+        self.level = None
         self.welch = None
 
         # Init physiological metrics attributes

mosqito/classes/__init__.py

@@ -6,33 +6,82 @@
 """
 
 # Standard library import
-import numpy as np
+from numpy import mean, sqrt, log10, linspace
 
-# Local import
-from mosqito.functions.shared.conversion import spectrum2dBA
 
-
-def comp_level(is_stationary, spec_third, fs, unit):
-    """Overall Sound Pressure Level calculation in the chosen unit
-    from the signal's third-octave spectrum
+def comp_level(signal, fs, nb_points=[], start=[], stop=[]):
+    """Overall Sound Pressure Level calculation from the time signal
+    The SPL can be computed according to a specified number of points or
+    during a given time frame
 
     Parameter:
     ----------
-    spec_third_dB: numpy.array
-        third octave spectrum of the signal
+    signal : numpy.array
+        time signal value
     fs: integer
         sampling frequency
-    unit : string
-        'dB' or 'dBA'
+
+    Output:
+    -------
+    level : numpy.array
+        SPL in dB
 
     """
+    # Check the inputs
+    if nb_points != []:
+        if type(nb_points) != int:
+            raise TypeError("ERROR : Number of points should be an integer")
+
+        if nb_points < 1 or nb_points > len(signal):
+            raise ValueError(
+                "ERROR : Number of points should be between 1 and the length of the given signal"
+            )
+
+    if start != [] and stop != []:
+        if type(start) != int and type(start) != float:
+            raise TypeError("ERROR : Start (in sec) should be an integer or a float ")
+
+        if type(stop) != int and type(stop) != float:
+            raise TypeError("ERROR : Stop (in sec) should be an integer or a float ")
+
+        if start < 0 or stop < 0 or start > len(signal) / fs or stop > len(signal) / fs:
+            raise ValueError(
+                "ERROR : Time frame should be between 0s and the duration of the signal"
+            )
+
+        if start == stop:
+            raise ValueError("ERROR : Start and stop values must be different")
+
+    # Initialization
+    level = []
+
+    # Case of a given time frame
+    if start != [] and stop != []:
+        frame = signal[int(start * fs) : int(stop * fs)]
+    else:
+        start = 0
+        stop = len(signal) / fs
+        frame = signal
+
+    # Case of a given number of points
+    if nb_points != []:
+
+        time_axis = linspace(start, stop, num=nb_points)
+
+        frame_size = int(len(frame) / nb_points)
+        for i in range(nb_points):
+            frame_i = frame[i * frame_size : i * frame_size + frame_size]
+            peff = sqrt(mean(frame_i ** 2))
+            level.append(10 * log10((peff ** 2 / (2e-05) ** 2)))
 
-    if unit == "dB":
-        level = 10 * np.log10(sum(np.power(10, spec_third["values"] / 10)))
+    else:
+        peff = sqrt(mean(frame ** 2))
+        level = 10 * log10((peff ** 2 / (2e-05) ** 2))
 
-    elif unit == "dBA":
-        # spectrum A-weighting
-        spec_third_dBA = spectrum2dBA(spec_third["values"], fs)
-        level = 10 * np.log10(sum(np.power(10, spec_third_dBA / 10)))
+    output = {
+        "name": "Sound Pressure Level",
+        "values": level,
+        "time": time_axis,
+    }
 
-    return level
+    return output