pqopen-lib 0.8.3__tar.gz → 0.8.4__tar.gz

{pqopen_lib-0.8.3 → pqopen_lib-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pqopen-lib
-Version: 0.8.3
+Version: 0.8.4
 Summary: A power quality processing library for calculating parameters from waveform data
 Project-URL: Homepage, https://github.com/DaqOpen/pqopen-lib
 Project-URL: Issues, https://github.com/DaqOpen/pqopen-lib/issues

{pqopen_lib-0.8.3 → pqopen_lib-0.8.4}/pqopen/powersystem.py

@@ -659,7 +659,7 @@ class PowerSystem(object):
             List[int]: Detected zero-crossing indices.
         """
         zcd_data = self._zcd_channel.read_data_by_index(start_idx=start_acq_sidx, stop_idx=stop_acq_sidx)
-        zero_crossings = self._zero_cross_detector.process(zcd_data)
+        zero_crossings = self._zero_cross_detector.process(zcd_data, self._zero_crossings[-1] - start_acq_sidx)
         if not zero_crossings:
             if (self._zero_crossings[-1] + self._samplerate/self._zcd_minimum_frequency - self._zero_cross_detector.filter_delay_samples) < stop_acq_sidx:
                 zero_crossings.append(self._zero_crossings[-1] + self._samplerate/self._last_known_freq - start_acq_sidx)
@@ -675,9 +675,10 @@ class PowerSystem(object):
                         if self._last_known_freq < self._zcd_minimum_frequency:
                             self._last_known_freq = self.nominal_frequency
                 self._calculation_mode = "FALLBACK"
+        elif self._calculation_mode == "FALLBACK":
+            self._calculation_mode = "NORMAL"
         else:
             self._calculation_mode = "NORMAL"
-
         return zero_crossings
 
     def get_aggregated_data(self, start_acq_sidx: int, stop_acq_sidx: int) -> dict:

{pqopen_lib-0.8.3 → pqopen_lib-0.8.4}/pqopen/zcd.py

@@ -55,7 +55,7 @@ class ZeroCrossDetector:
         self.filter_delay_samples = np.angle(h)[0] / (2 * np.pi) * self.samplerate / self.f_cutoff - 1 # due to adding sample in front for continuity
         self.filtered_data = []
 
-    def process(self, data: np.ndarray)-> list:
+    def process(self, data: np.ndarray, abs_last_zc: int = None)-> list:
         """
         Processes a block of input data and detect zero-crossings.
 
@@ -117,6 +117,8 @@ class ZeroCrossDetector:
             else:
                 if self._last_zc  and (real_zc <= self._last_zc):
                     logger.warning("Detected ZC before last one, ignoring")
+                elif (abs_last_zc is not None) and (self._last_zc  and (real_zc <= abs_last_zc)):
+                    logger.warning("Detected ZC before last one, ignoring")
                 else:    
                     zero_crossings.append(real_zc + self.filter_delay_samples)
                     last_used_p_idx = p_idx

{pqopen_lib-0.8.3 → pqopen_lib-0.8.4}/pyproject.toml

@@ -12,7 +12,7 @@ packages = ["pqopen"]
 
 [project]
 name = "pqopen-lib"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
     "numpy",
     "daqopen-lib >= 0.7.4",

{pqopen_lib-0.8.3 → pqopen_lib-0.8.4}/test/powersystem-test.py

@@ -143,6 +143,22 @@ class TestPowerSystemZcd(unittest.TestCase):
         u_rms, _ = self.power_system.output_channels["U1_1p_rms"].read_data_by_acq_sidx(0, values.size)
         self.assertIsNone(np.testing.assert_array_almost_equal(u_rms[-10:], expected_u_rms[-10:], 3))
 
+    def test_one_period_calc_temp_fallback(self):
+        t = np.linspace(0, 10, int(self.power_system._samplerate)*10, endpoint=False)
+        values = np.sqrt(2)*np.sin(2*np.pi*50*t)
+
+        values[int(self.power_system._samplerate*3):int(self.power_system._samplerate*7)] *= 0
+        
+        expected_u_rms = np.array(np.zeros(48)) + 1.0
+
+        calc_blocksize = 50
+        for i in range(values.size//calc_blocksize):
+            self.u_channel.put_data(values[i*calc_blocksize:(i+1)*calc_blocksize])
+            self.power_system.process()
+        # Check Voltage
+        u_rms, _ = self.power_system.output_channels["U1_1p_rms"].read_data_by_acq_sidx(values.size-self.power_system._samplerate, values.size)
+        self.assertIsNone(np.testing.assert_array_almost_equal(u_rms[-10:], expected_u_rms[-10:], 3))
+
 class TestPowerSystemCalculation(unittest.TestCase):
     def setUp(self):
         self.u_channel = AcqBuffer()