fixes

saqc/core/core.py

@@ -10,7 +10,6 @@ from saqc.core.reader import readConfig, checkConfig
 from saqc.core.config import Fields
 from saqc.core.evaluator import evalExpression
 from saqc.lib.plotting import plotHook, plotAllHook
-from saqc.lib.tools import combineDataFrames
 from saqc.lib.types import DiosLikeT
 from saqc.flagger import BaseFlagger, CategoricalFlagger, SimpleFlagger, DmpFlagger
 
@@ -39,7 +38,9 @@ def _convertInput(data, flags):
 
 
 def _checkAndConvertInput(data, flags, flagger):
-    if not isinstance(data, DiosLikeT):
+    dios_like = (dios.DictOfSeries, pd.DataFrame)
+
+    if not isinstance(data, dios_like):
         raise TypeError("data must be of type dios.DictOfSeries or pd.DataFrame")
 
     if isinstance(data, pd.DataFrame):
@@ -55,7 +56,7 @@ def _checkAndConvertInput(data, flags, flagger):
 
     if flags is not None:
 
-        if not isinstance(flags, DiosLikeT):
+        if not isinstance(flags, dios_like):
             raise TypeError("flags must be of type dios.DictOfSeries or pd.DataFrame")
 
         if isinstance(flags, pd.DataFrame):

test/core/test_core.py

@@ -9,7 +9,7 @@ import dios.dios as dios
 from saqc.funcs import register, flagRange
 from saqc.core.core import run
 from saqc.core.config import Fields as F
-from saqc.lib.plotting import _plot
+import saqc.lib.plotting as splot
 from test.common import initData, initMetaDict, TESTFLAGGER
 
 
@@ -198,8 +198,8 @@ def test_plotting(data, flagger):
     field, *_ = data.columns
     flagger = flagger.initFlags(data)
     _, flagger_range = flagRange(data, field, flagger, min=10, max=90, flag=flagger.BAD)
-    _, flagger_range = flagRange(
-        data, field, flagger_range, min=40, max=60, flag=flagger.GOOD
-    )
-    mask = flagger.getFlags(field) != flagger_range.getFlags(field)
-    _plot(data, mask, field, flagger, interactive_backend=False)
+    data_new, flagger_range = flagRange(data, field, flagger_range, min=40, max=60, flag=flagger.GOOD)
+    splot._interactive = False
+    splot._plotSingleVariable(data, data_new, flagger, flagger_range, sources=[], targets=[data_new.columns[0]])
+    splot._plotMultipleVariables(data, data_new, flagger, flagger_range, targets=data_new.columns)
+    splot._interactive = True