Merge branch 'develop' of https://git.ufz.de/rdm-software/saqc into develop

saqc/core/register.py

@@ -375,7 +375,7 @@ def _restoreFlags(flags: Flags, old_state: CallState):
         squeezed = flags.history[c].max(raw=True)
 
         # nothing to update
-        if history.empty or (squeezed == UNTOUCHED).all():
+        if history.empty:
             continue
 
         out.history[c] = out.history[c].append(squeezed, force=True, meta=meta)

saqc/funcs/curvefit.py

@@ -111,6 +111,7 @@ def fitPolynomial(
     """
     # TODO: some (rater large) parts are functional similar to saqc.funcs.rolling.roll
     if data[field].empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
     data = data.copy()
     to_fit = data[field]

saqc/funcs/drift.py

@@ -458,6 +458,7 @@ def correctDrift(
     """
     # 1: extract fit intervals:
     if data[maint_data_field].empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     data = data.copy()

saqc/funcs/outliers.py

@@ -79,6 +79,7 @@ def flagByStray(
     scores = data[field].dropna()
 
     if scores.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     if not partition_freq:
@@ -676,6 +677,7 @@ def flagRaise(
         raise_series = raise_series.apply(raise_check, args=(thresh,), raw=True)
 
     if raise_series.isna().all():
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     # "unflag" values of insufficient deviation to their predecessors
@@ -783,6 +785,7 @@ def flagMAD(
     """
     d = data[field]
     if d.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     median = d.rolling(window=window, closed="both").median()
@@ -879,6 +882,7 @@ def flagOffset(
     """
     dataseries = data[field].dropna()
     if dataseries.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     # using reverted series - because ... long story.
@@ -911,6 +915,7 @@ def flagOffset(
 
     post_jumps = post_jumps[post_jumps]
     if post_jumps.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     # get all the entries preceding a significant jump and its successors within "length" range
@@ -1227,6 +1232,7 @@ def flagCrossStatistic(
 
     mask = diff_scores > thresh
     if mask.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     for var in fields:

saqc/funcs/rolling.py

@@ -72,6 +72,7 @@ def roll(
     data = data.copy()
     to_fit = data[field]
     if to_fit.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     regular = getFreqDelta(to_fit.index)

saqc/funcs/scores.py

@@ -123,6 +123,7 @@ def assignKNNScore(
         val_frame = val_frame.transform(trafo)
 
     if val_frame.empty:
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     # partitioning

tests/core/test_reader.py

@@ -10,6 +10,7 @@ from pathlib import Path
 from saqc.core.config import Fields as F
 from saqc.core.core import SaQC
 from saqc.core.register import FUNC_MAP, flagging
+from saqc.constants import UNTOUCHED
 
 from tests.common import initData, writeIO
 
@@ -110,6 +111,7 @@ def test_configChecks(data):
 
     @flagging(masking="none")
     def flagFunc(data, field, flags, arg, opt_arg=None, **kwargs):
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     header = f"{F.VARNAME};{F.TEST}"
@@ -135,6 +137,7 @@ def test_supportedArguments(data):
 
     @flagging(masking="field")
     def func(data, field, flags, kwarg, **kwargs):
+        flags[:, field] = UNTOUCHED
         return data, flags
 
     var1 = data.columns[0]