pqopen-lib 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

pqopen/powersystem.py

@@ -305,11 +305,11 @@ class PowerSystem(object):
             if self._features["harmonics"]:
                 for phase in self._phases:
                     if phase._u_channel.freq_response:
-                        phase._u_fft_corr_array = create_fft_corr_array(self._harm_fft_resample_size//2+1,
+                        phase._u_fft_corr_array = create_fft_corr_array(self._harm_fft_resample_size,
                                                                         self._samplerate/2,
                                                                         phase._u_channel.freq_response)
                     if phase._i_channel is not None and phase._i_channel.freq_response:
-                        phase._i_fft_corr_array = create_fft_corr_array(self._harm_fft_resample_size//2+1,
+                        phase._i_fft_corr_array = create_fft_corr_array(self._harm_fft_resample_size,
                                                                         self._samplerate/2,
                                                                         phase._i_channel.freq_response)
             
@@ -481,7 +481,8 @@ class PowerSystem(object):
             if self._features["harmonics"]:
                 data_fft_U = pq.resample_and_fft(u_values, self._harm_fft_resample_size)
                 if phase._u_fft_corr_array is not None:
-                    data_fft_U *= phase._u_fft_corr_array
+                    resample_factor =  min(self._harm_fft_resample_size / u_values.size, 1)
+                    data_fft_U *= phase._u_fft_corr_array[np.linspace(0, self._harm_fft_resample_size*resample_factor, self._harm_fft_resample_size//2+1).astype(np.int32)]
                 u_h_mag, u_h_phi = pq.calc_harmonics(data_fft_U, self.nper, self._features["harmonics"])
                 u_ih_mag = pq.calc_interharmonics(data_fft_U, self.nper, self._features["harmonics"])
                 if phase._number == 1: # use phase 1 angle as reference
@@ -658,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)
@@ -674,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/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.2.dist-info → pqopen_lib-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pqopen-lib
-Version: 0.8.2
+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.2.dist-info → pqopen_lib-0.8.4.dist-info}/RECORD

@@ -3,10 +3,10 @@ pqopen/auxcalc.py,sha256=P11Nu9pgJRoPYZDjLk-mXI6Ha02LoTH5bS9FdFTvC9M,2733
 pqopen/eventdetector.py,sha256=NKZU7GbeorZdkYu3ET4lhMaeynw70GhIGO2p1xH4aTA,11962
 pqopen/helper.py,sha256=0msrm6i1v8jj2Z5X8F7wDEW0KD5i91RBNZwPJC05YrA,2533
 pqopen/powerquality.py,sha256=dRVCedWa1QJKHgdiYoIIdvhH_p40cwpgeUePO5u1j28,15953
-pqopen/powersystem.py,sha256=R9nOIv5Qpuc1JPDzP67NGP9LNqB74unpY85yS1CuWPg,48921
+pqopen/powersystem.py,sha256=BDB-Xf-xe3UYVBUyX2gjKXnWpeZWTQTaLDSGCvtmGZ4,49256
 pqopen/storagecontroller.py,sha256=AhVaPgIh4CBKKMJm9Ja0dOjVd4dLppWprxeeg3vrmAk,31266
-pqopen/zcd.py,sha256=jN4jkGgFNBWQWRebefLc1GjUKm1xdYQXav_ajYfkuo4,6054
-pqopen_lib-0.8.2.dist-info/METADATA,sha256=tdCcqLVphJ4slcPgOe9gofVITNC2k4qNMnPwuViNCAE,4787
-pqopen_lib-0.8.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-pqopen_lib-0.8.2.dist-info/licenses/LICENSE,sha256=yhYwu9dioytbAvNQa0UBwaBVcALqiOoBViEs4HLW6aU,1064
-pqopen_lib-0.8.2.dist-info/RECORD,,
+pqopen/zcd.py,sha256=olJZsHRd1CjU65vysc2emR5wFGMkayIWdUEDNE8jfIc,6253
+pqopen_lib-0.8.4.dist-info/METADATA,sha256=hC1fidnpdel5XKb8T5zDJ6H3zidLNtTTJuhnYnKAVQE,4787
+pqopen_lib-0.8.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pqopen_lib-0.8.4.dist-info/licenses/LICENSE,sha256=yhYwu9dioytbAvNQa0UBwaBVcALqiOoBViEs4HLW6aU,1064
+pqopen_lib-0.8.4.dist-info/RECORD,,