From e5bb0a522e7d308b5f1cfbab8485092a8795077e Mon Sep 17 00:00:00 2001
From: Peter Luenenschloss <peter.luenenschloss@ufz.de>
Date: Wed, 4 Dec 2019 16:12:26 +0100
Subject: [PATCH] removed superfluid lib method and imports from lib
---
saqc/funcs/break_detection.py | 2 +-
saqc/funcs/constants_detection.py | 2 +-
saqc/funcs/soil_moisture_tests.py | 4 +---
saqc/lib/tools.py | 11 -----------
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/saqc/funcs/break_detection.py b/saqc/funcs/break_detection.py
index 6562ead33..60112d885 100644
--- a/saqc/funcs/break_detection.py
+++ b/saqc/funcs/break_detection.py
@@ -7,7 +7,7 @@ import pandas as pd
from scipy.signal import savgol_filter
from saqc.funcs.register import register
-from saqc.lib.tools import retrieveTrustworthyOriginal, offset2periods
+from saqc.lib.tools import retrieveTrustworthyOriginal
@register("breaks_spektrumBased")
diff --git a/saqc/funcs/constants_detection.py b/saqc/funcs/constants_detection.py
index f0c561d68..639aa1801 100644
--- a/saqc/funcs/constants_detection.py
+++ b/saqc/funcs/constants_detection.py
@@ -83,7 +83,7 @@ def flagConstant_varianceBased(
dataseries, data_rate = retrieveTrustworthyOriginal(data, field, flagger)
- min_periods = int(offset2periods(plateau_window_min, data_rate))
+ min_periods = int(np.ceil(pd.Timedelta(plateau_window_min) / pd.Timedelta(data_rate)))
plateaus = dataseries.rolling(
window=plateau_window_min, min_periods=min_periods
diff --git a/saqc/funcs/soil_moisture_tests.py b/saqc/funcs/soil_moisture_tests.py
index 5722c0a36..712c492e3 100644
--- a/saqc/funcs/soil_moisture_tests.py
+++ b/saqc/funcs/soil_moisture_tests.py
@@ -12,9 +12,7 @@ from saqc.funcs.spike_detection import flagSpikes_spektrumBased
from saqc.funcs.constants_detection import flagConstant_varianceBased
from saqc.funcs.register import register
from saqc.lib.tools import (
- estimateSamplingRate,
- retrieveTrustworthyOriginal,
- offset2periods,
+ retrieveTrustworthyOriginal
)
diff --git a/saqc/lib/tools.py b/saqc/lib/tools.py
index bb5bb7b21..c2ca07644 100644
--- a/saqc/lib/tools.py
+++ b/saqc/lib/tools.py
@@ -157,17 +157,6 @@ def offset2seconds(offset):
return pd.Timedelta.total_seconds(pd.Timedelta(offset))
-def offset2periods(input_offset, period_offset):
- """Function returns the number of periods of length "periods_offset" that sum up to length "input offset".
- (Namely their fraction.)
-
- :param input_offset Offset string or pandas offset object.
- :param period_offset Offset string or pandas offset object.
- """
-
- return offset2seconds(input_offset) / offset2seconds(period_offset)
-
-
def flagWindow(
flagger_old, flagger_new, field, direction="fw", window=0, **kwargs
) -> pd.Series:
--
GitLab