acoular 25.4__py3-none-any.whl → 25.7__py3-none-any.whl

acoular/sources.py

@@ -45,6 +45,7 @@ from numpy import (
     mod,
     newaxis,
     ones,
+    ones_like,
     pi,
     real,
     repeat,
@@ -317,7 +318,7 @@ def get_modes(lOrder, direction, mpos, sourceposition=None):  # noqa: N803
     return modes
 
 
-@deprecated_alias({'name': 'file'})
+@deprecated_alias({'name': 'file'}, removal_version='25.10')
 class TimeSamples(SamplesGenerator):
     """
     Container for processing time data in ``*.h5`` or NumPy array format.
@@ -746,7 +747,7 @@ class MaskedTimeSamples(TimeSamples):
             i += num
 
 
-@deprecated_alias({'numchannels': 'num_channels', 'numsamples': 'num_samples'}, read_only=True)
+@deprecated_alias({'numchannels': 'num_channels', 'numsamples': 'num_samples'}, read_only=True, removal_version='25.10')
 class PointSource(SamplesGenerator):
     """
     Define a fixed point source emitting a signal, intended for simulations.
@@ -1164,46 +1165,48 @@ class MovingPointSource(PointSource):
         # from the end of the calculated signal.
 
         signal = self.signal.usignal(self.up)
-        out = empty((num, self.num_channels))
         # shortcuts and initial values
-        m = self.mics
-        t = self.start * ones(m.num_mics)
-        i = 0
+        num_mics = self.num_channels
+        mpos = self.mics.pos[:, :, newaxis]
+        t = self.start + ones(num_mics)[:, newaxis] * arange(num) / self.sample_freq
         epslim = 0.1 / self.up / self.sample_freq
         c0 = self.env.c
         tr = self.trajectory
         n = self.num_samples
-        while n:
-            n -= 1
-            eps = ones(m.num_mics)
+        while n > 0:
+            eps = ones_like(t)  # init discrepancy in time
             te = t.copy()  # init emission time = receiving time
             j = 0
             # Newton-Rhapson iteration
             while abs(eps).max() > epslim and j < 100:
-                loc = array(tr.location(te))
-                rm = loc - m.pos  # distance vectors to microphones
+                loc = array(tr.location(te.flatten())).reshape((3, num_mics, -1))
+                rm = loc - mpos  # distance vectors to microphones
                 rm = sqrt((rm * rm).sum(0))  # absolute distance
                 loc /= sqrt((loc * loc).sum(0))  # distance unit vector
-                der = array(tr.location(te, der=1))
+                der = array(tr.location(te.flatten(), der=1)).reshape((3, num_mics, -1))
                 Mr = (der * loc).sum(0) / c0  # radial Mach number
-                eps = (te + rm / c0 - t) / (1 + Mr)  # discrepancy in time
+                eps[:] = (te + rm / c0 - t) / (1 + Mr)  # discrepancy in time
                 te -= eps
                 j += 1  # iteration count
-            t += 1.0 / self.sample_freq
+            t += num / self.sample_freq
             # emission time relative to start time
             ind = (te - self.start_t + self.start) * self.sample_freq
             if self.conv_amp:
                 rm *= (1 - Mr) ** 2
             try:
-                out[i] = signal[array(0.5 + ind * self.up, dtype=int64)] / rm
-                i += 1
-                if i == num:
-                    yield out
-                    i = 0
-            except IndexError:  # if no more samples available from the source
+                ind = array(0.5 + ind * self.up, dtype=int64)
+                out = (signal[ind] / rm).T
+                yield out[:n]
+            except IndexError:  # last incomplete frame
+                signal_length = signal.shape[0]
+                # Filter ind to exclude columns containing values greater than signal_length
+                mask = (ind < signal_length).all(axis=0)
+                out = (signal[ind[:, mask]] / rm[:, mask]).T
+                # If out is not empty, yield it
+                if out.size > 0:
+                    yield out[:n]
                 break
-        if i > 0:  # if there are still samples to yield
-            yield out[:i]
+            n -= num
 
 
 class PointSourceDipole(PointSource):
@@ -1947,7 +1950,7 @@ class MovingLineSource(LineSource, MovingPointSource):
         yield out[:i]
 
 
-@deprecated_alias({'numchannels': 'num_channels'}, read_only=True)
+@deprecated_alias({'numchannels': 'num_channels'}, read_only=True, removal_version='25.10')
 class UncorrelatedNoiseSource(SamplesGenerator):
     """
     Simulate uncorrelated white or pink noise signals at multiple channels.
@@ -2111,7 +2114,7 @@ class UncorrelatedNoiseSource(SamplesGenerator):
                 return
 
 
-@deprecated_alias({'numchannels': 'num_channels', 'numsamples': 'num_samples'}, read_only=True)
+@deprecated_alias({'numchannels': 'num_channels', 'numsamples': 'num_samples'}, read_only=True, removal_version='25.10')
 class SourceMixer(SamplesGenerator):
     """
     Combine signals from multiple sources by mixing their outputs.

acoular/spectra.py

@@ -61,8 +61,9 @@ from .internal import digest
 from .tools.utils import find_basename
 
 
-@deprecated_alias({'numchannels': 'num_channels'}, read_only=True)
-@deprecated_alias({'time_data': 'source'}, read_only=False)
+@deprecated_alias(
+    {'numchannels': 'num_channels', 'time_data': 'source'}, read_only=['numchannels'], removal_version='25.10'
+)
 class BaseSpectra(ABCHasStrictTraits):
     """
     Base class for handling spectral data in Acoular.

acoular/tbeamform.py

@@ -174,6 +174,9 @@ class BeamformerTime(TimeOut):
             p_res *= weights
             if p_res.shape[0] < buffer.result_num:  # last block shorter
                 num = p_res.shape[0] - max_sample_delay
+                # exit loop if there is not enough data left to be processed
+                if num <= 0:
+                    break
                 n_index = arange(0, num + 1)[:, newaxis]
             # init step
             Phi, autopow = self._delay_and_sum(num, p_res, d_interp2, d_index, amp)

acoular/tools/helpers.py

@@ -11,8 +11,10 @@
     barspectrum
     bardata
     c_air
+    get_data_file
 """
 
+from pathlib import Path
 from warnings import warn
 
 from numpy import (
@@ -401,3 +403,28 @@ def c_air(t, h, p=101325, co2=0.04):
         + a14 * x_c**2
         + a15 * x_w * p * x_c
     )
+
+
+def get_data_file(file):
+    """
+    Ensures a file is available locally.
+
+    If the file does not exist in ``'../data/'`` or the current directory,
+    it is downloaded from the Acoular GitHub repository.
+
+    Returns
+    -------
+    :class:`pathlib.Path`
+        Path to the file.
+    """
+    data_file = Path('../data') / file
+    if not data_file.exists():
+        data_file = Path().cwd() / file
+        if not data_file.exists():
+            import urllib.request
+
+            url = 'https://github.com/acoular/acoular/raw/master/examples/data/' + file
+            urllib.request.urlretrieve(url, data_file)
+        print(f'Calibration file location: {data_file}')
+
+    return data_file