David Schäfer · e427d266 · 12694fe7 · 12694fe7
--- a/saqc/lib/ts_operators.py
+++ b/saqc/lib/ts_operators.py
-    if method == "nagg":
-        # all values within a grid points range (+/- freq/2, closed to the left) get aggregated with 'agg method'
-        base = seconds_total / 2
-        label = 'left'
-        closed = 'left'
-    elif method == "bagg":
-        # all values in a sampling interval get aggregated with agg_method and assigned to the last grid point
-        base = 0
-        label = 'left'
-        closed = 'left'
-    else:
-        # all values in a sampling interval get aggregated with agg_method and assigned to the next grid point
-        base = 0
-        label = 'right'
-        closed = 'right'
+    base, label, closed = methods[method](seconds_total)
--- a/saqc/lib/ts_operators.py
+++ b/saqc/lib/ts_operators.py
    try:
-        # get rid of nan_prefix attached to numpys nanfuncs ("ignore nan is pointless down here -
-        # resample doesnt pass no nans to the func applied)
-        if agg_func.__name__[:3] == 'nan':
-            check_name = agg_func.__name__[3:]
-        else:
-            check_name = agg_func.__name__
-
-        # another nasty special case: if function "count" was passed, we not want empty intervals to be replaced by nan:
+        check_name = re.sub("^nan", "", agg_func.__name__)
+        # a nasty special case: if function "count" was passed, we not want empty intervals to be replaced by nan:
        if check_name == 'count':
            empty_intervals[:] = False
-
        data = getattr(data_resampler, check_name)()
    except AttributeError: