minor minors

saqc/funcs/spike_detection.py

@@ -134,7 +134,7 @@ def flagSpikes_Basic(data, flags, field, flagger, thresh=7, tol=0, length='15min
     """
 
     # retrieve data series
-    dataseries = data[field].dropna()
+    dataseries = getPandasData(data, field).copy().dropna()
     # get all the entries preceding a significant jump
     pre_jumps = dataseries.diff(periods=-1).abs() > thresh
     pre_jumps = pre_jumps[pre_jumps]
@@ -181,6 +181,7 @@ def flagSpikes_Basic(data, flags, field, flagger, thresh=7, tol=0, length='15min
     to_flag = to_flag.drop_duplicates(keep='first')
     flags = flagger.setFlags(flags, field, to_flag, **kwargs)
 
+    return data, flags
 
 @register("Spikes_SpektrumBased")
 def flagSpikes_SpektrumBased(data, flags, field, flagger, filter_window_size='3h',

test/funcs/test_spike_detection.py

@@ -9,7 +9,7 @@ from saqc.flagger.baseflagger import BaseFlagger
 from saqc.flagger.dmpflagger import DmpFlagger
 from saqc.flagger.simpleflagger import SimpleFlagger
 
-from saqc.funcs.spike_detection import flagSpikes_SpektrumBased, flagMad, polyResMad
+from saqc.funcs.spike_detection import flagSpikes_SpektrumBased, flagMad, polyResMad, flagSpikes_Basic
 
 from saqc.lib.tools import getPandasData
 
@@ -19,7 +19,7 @@ TESTFLAGGERS = [
     SimpleFlagger()]
 
 
-@pytest.fixture(scope='module')
+#@pytest.fixture(scope='module')
 def spiky_data():
     index = pd.date_range(start='2011-01-01', end='2011-01-05', freq='5min')
     spiky_series = pd.Series(np.linspace(1, 2, index.size), index=index, name='spiky_data')
@@ -58,11 +58,16 @@ def test_flagPolyResMad(spiky_data, flagger):
     test_sum = (flag_result[spiky_data[1]] == flagger.BAD).sum()
     assert test_sum == len(spiky_data[1])
 
-@pytest.mar.parametrize('flagger', TESTFLAGGERS)
+@pytest.mark.parametrize('flagger', TESTFLAGGERS)
 def test_flagSpikes_Basic(spiky_data, flagger):
     data = spiky_data[0]
     flags = flagger.initFlags(data.to_frame())
     data, flag_result = flagSpikes_Basic(data, flags, 'spiky_data', flagger, thresh=60, tol=10, length='20min')
     flag_result = getPandasData(flag_result, 0)
     test_sum = (flag_result[spiky_data[1]] == flagger.BAD).sum()
-    assert test_sum == len(spiky_data[1])
\ No newline at end of file
+    assert test_sum == len(spiky_data[1])
+
+if __name__ == '__main__':
+    flagger = DmpFlagger()
+    d = spiky_data()
+    test_flagSpikes_Basic(d, flagger)
\ No newline at end of file