pqopen-lib 0.8.0__tar.gz → 0.8.1__tar.gz

{pqopen_lib-0.8.0 → pqopen_lib-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pqopen-lib
-Version: 0.8.0
+Version: 0.8.1
 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.0 → pqopen_lib-0.8.1}/pqopen/powersystem.py

@@ -672,13 +672,8 @@ class PowerSystem(object):
                 self._calculation_mode = "FALLBACK"
         else:
             self._calculation_mode = "NORMAL"
-        
-        # Remove Non monotonic rising zero crossings
-        filtered_zero_crossings = []
-        for idx,zc in enumerate(zero_crossings):
-            if (int(zc)+start_acq_sidx) >= self._zero_crossings[-1] or np.isnan(self._zero_crossings[-1]):
-                filtered_zero_crossings.append(zc)
-        return filtered_zero_crossings
+
+        return zero_crossings
 
     def get_aggregated_data(self, start_acq_sidx: int, stop_acq_sidx: int) -> dict:
         """

{pqopen_lib-0.8.0 → pqopen_lib-0.8.1}/pqopen/zcd.py

@@ -48,6 +48,7 @@ class ZeroCrossDetector:
         self._last_zc_p = None
         self._last_zc_n = None
         self._last_zc_n_val = None
+        self._last_zc = None
 
         # Calculate the filter delay in samples
         w, h = signal.freqz(self._filter_coeff[0], self._filter_coeff[1], worN=[self.f_cutoff], fs=self.samplerate)
@@ -111,9 +112,15 @@ class ZeroCrossDetector:
             k = (y2 - y1) / (x2 - x1)
             d = y1 - k * x1
             real_zc = -d/k
-            #real_zc = (threshold_p_cross[p_idx] - threshold_n_cross[n_idx] + 1) / 2 + threshold_n_cross[n_idx]
-            zero_crossings.append(real_zc + self.filter_delay_samples)
-            last_used_p_idx = p_idx
+            if np.isnan(real_zc):
+                logger.warning("Detection Error: real_zc is NaN, ignoring")
+            else:
+                if self._last_zc  and (real_zc <= self._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
+                    self._last_zc = real_zc
 
         # Update the last negative threshold-crossing for the next block
         if last_used_p_idx < len(threshold_p_cross) and len(threshold_n_cross) > 0:
@@ -126,4 +133,8 @@ class ZeroCrossDetector:
         else:
             self._last_zc_n = None
 
+        # Update Last Valid ZC Index
+        if self._last_zc:
+            self._last_zc -= len(data)
+
         return zero_crossings

{pqopen_lib-0.8.0 → pqopen_lib-0.8.1}/pyproject.toml

@@ -12,7 +12,7 @@ packages = ["pqopen"]
 
 [project]
 name = "pqopen-lib"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
     "numpy",
     "daqopen-lib",