SignalProcessingTools 1.2.1__tar.gz → 1.2.3__tar.gz

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SignalProcessingTools
-Version: 1.2.1
+Version: 1.2.3
 Summary: Signal processing tools
 Author: attr: SignalProcessingTools.__author__
 Author-email: bruno.zuadacoelho@deltares.nl, aron.noordam@deltares.nl
@@ -13,8 +13,8 @@ Requires-Dist: matplotlib>=3.10
 Requires-Dist: numpy>=2.2
 Requires-Dist: scipy>=1.15
 Provides-Extra: testing
-Requires-Dist: pytest>=8.3; extra == "testing"
-Requires-Dist: tox>=4.24; extra == "testing"
+Requires-Dist: pytest>=8.0; extra == "testing"
+Requires-Dist: tox>=4.13; extra == "testing"
 
 # SignalProcessingTools
 

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/SignalProcessingTools/__version__.py

@@ -1,3 +1,3 @@
 __title__ = "SignalProcessingTools"
-__version__ = "1.2.1"
+__version__ = "1.2.3"
 __author__ = "Bruno Zuada Coelho, Aron Noordam"

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/SignalProcessingTools/time_signal.py

@@ -191,12 +191,22 @@ class TimeSignalProcessing:
             nfft = self.window_size
             sig = self.signal
             odd_length = False
+            normalise_fct = np.sum(self.window)
         else:
             # if nb_points is None: nb_points is signal length
             if nb_points is None:
                 nfft = len(self.signal)
                 sig = self.signal
                 odd_length = False
+                normalise_fct = np.sum(self.window)
+            else:
+                nfft = nb_points
+                sig = np.zeros(nfft)
+                sig[:len(self.signal)] = self.signal
+                odd_length = False
+                self.window = np.ones(nfft)
+                self.window_size = nfft
+                normalise_fct = len(self.signal)
 
             # if length is even
             if nfft % 2 != 0:
@@ -206,11 +216,6 @@ class TimeSignalProcessing:
                 self.window_size = nfft
                 odd_length = True
 
-        # Normalize by the sum of the window samples.
-        # This compensates for the energy reduction caused by non-rectangular windows, aiming to preserve the
-        # peak amplitude of stationary sinusoids.
-        normalise_fct = np.sum(self.window)
-
         spectrum_w = np.zeros((nfft, self.nb_windows), dtype="complex128")
         hop_size = int(self.window_size * (1 - 0.5))
 
@@ -224,6 +229,9 @@ class TimeSignalProcessing:
             signal_w = self.window * sig[idx_ini:idx_end]
 
             # fft window signal
+            # Normalize by the sum of the window samples.
+            # This compensates for the energy reduction caused by non-rectangular windows, aiming to preserve the
+            # peak amplitude of stationary sinusoids.
             spectrum_w[:, w] = np.fft.fft(signal_w, nfft) / normalise_fct
 
 

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/SignalProcessingTools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SignalProcessingTools
-Version: 1.2.1
+Version: 1.2.3
 Summary: Signal processing tools
 Author: attr: SignalProcessingTools.__author__
 Author-email: bruno.zuadacoelho@deltares.nl, aron.noordam@deltares.nl
@@ -13,8 +13,8 @@ Requires-Dist: matplotlib>=3.10
 Requires-Dist: numpy>=2.2
 Requires-Dist: scipy>=1.15
 Provides-Extra: testing
-Requires-Dist: pytest>=8.3; extra == "testing"
-Requires-Dist: tox>=4.24; extra == "testing"
+Requires-Dist: pytest>=8.0; extra == "testing"
+Requires-Dist: tox>=4.13; extra == "testing"
 
 # SignalProcessingTools
 

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/SignalProcessingTools.egg-info/requires.txt

@@ -3,5 +3,5 @@ numpy>=2.2
 scipy>=1.15
 
 [testing]
-pytest>=8.3
-tox>=4.24
+pytest>=8.0
+tox>=4.13

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/setup.cfg

@@ -22,8 +22,8 @@ python_requires = >=3.10
 
 [options.extras_require]
 testing = 
-	pytest>=8.3
-	tox>=4.24
+	pytest>=8.0
+	tox>=4.13
 
 [egg_info]
 tag_build = 

{signalprocessingtools-1.2.1 → signalprocessingtools-1.2.3}/tests/test_time_signal.py

@@ -54,6 +54,34 @@ def test_fft(test_data):
     np.testing.assert_almost_equal(sig.frequency[np.argmax(sig.amplitude[:int(len(sig.amplitude) / 2)])], 2.675, 2)
     np.testing.assert_almost_equal(np.max(sig.amplitude[:int(len(sig.amplitude) / 2)]), 1.137, 2)
 
+def test_fft_nb_points(test_data):
+    """
+    Test the fft function
+    """
+
+    # results half representation
+    x, y, _ = test_data
+    sig = TimeSignalProcessing(x, y)
+    sig.fft(nb_points=2**18)
+
+    # check if signal lenght has been adapted to window size
+    assert len(sig.amplitude) == (2**18)/2
+    assert len(sig.frequency) == (2**18)/2
+
+    np.testing.assert_almost_equal(sig.frequency[np.argmax(sig.amplitude)], FREQ, 2)
+    np.testing.assert_almost_equal(np.max(sig.amplitude), AMP, 2)
+
+    # results full representation
+    sig.fft(nb_points=2**18, half_representation=False)
+
+    # check if signal lenght has been adapted to window size
+    assert len(sig.amplitude) == 2**18
+    assert len(sig.frequency) == 2**18
+
+    np.testing.assert_almost_equal(sig.frequency[np.argmax(sig.amplitude[:int(len(sig.amplitude) / 2)])], FREQ, 2)
+    np.testing.assert_almost_equal(np.max(sig.amplitude[:int(len(sig.amplitude) / 2)]), AMP / 2, 2)
+
+
 def test_fft_window(test_data):
     """
     Test the fft function with window