Skip to content
Snippets Groups Projects
Commit 9ff84d96 authored by Peter Lünenschloß's avatar Peter Lünenschloß
Browse files

harmonization wrapper do not insert BAD-flagged nans for empty intervals any more

parent 7acd7058
No related branches found
No related tags found
2 merge requests!193Release 1.4,!188Release 1.4
Pipeline #5347 passed with stage
in 6 minutes and 41 seconds
...@@ -13,42 +13,41 @@ logger = logging.getLogger("SaQC") ...@@ -13,42 +13,41 @@ logger = logging.getLogger("SaQC")
@register @register
def harm_shift2Grid(data, field, flagger, freq, method="nshift", drop_flags=None, empty_intervals_flag=None, **kwargs): def harm_shift2Grid(data, field, flagger, freq, method="nshift", drop_flags=None, **kwargs):
data, flagger = proc_fork(data, field, flagger) data, flagger = proc_fork(data, field, flagger)
data, flagger = proc_shift(data, field, flagger, freq, method, drop_flags=drop_flags, data, flagger = proc_shift(data, field, flagger, freq, method, drop_flags=drop_flags,
empty_intervals_flag=empty_intervals_flag, **kwargs) empty_intervals_flag=flagger.UNFLAGGED, **kwargs)
return data, flagger return data, flagger
@register @register
def harm_aggregate2Grid( def harm_aggregate2Grid(
data, field, flagger, freq, value_func, flag_func=np.nanmax, method="nagg", drop_flags=None, data, field, flagger, freq, value_func, flag_func=np.nanmax, method="nagg", drop_flags=None, **kwargs
empty_intervals_flag=None, **kwargs
): ):
data, flagger = proc_fork(data, field, flagger) data, flagger = proc_fork(data, field, flagger)
data, flagger = proc_resample(data, field, flagger, freq, agg_func=value_func, flag_agg_func=flag_func, data, flagger = proc_resample(data, field, flagger, freq, agg_func=value_func, flag_agg_func=flag_func,
method=method, empty_intervals_flag=empty_intervals_flag, drop_flags=drop_flags, method=method, empty_intervals_flag=flagger.UNFLAGGED, drop_flags=drop_flags,
all_na_2_empty=True, **kwargs) all_na_2_empty=True, **kwargs)
return data, flagger return data, flagger
@register @register
def harm_linear2Grid(data, field, flagger, freq, drop_flags=None, empty_intervals_flag=None, **kwargs): def harm_linear2Grid(data, field, flagger, freq, drop_flags=None, **kwargs):
data, flagger = proc_fork(data, field, flagger) data, flagger = proc_fork(data, field, flagger)
data, flagger = proc_interpolateGrid(data, field, flagger, freq, 'time', data, flagger = proc_interpolateGrid(data, field, flagger, freq, 'time',
drop_flags=drop_flags, empty_intervals_flag=empty_intervals_flag, **kwargs) drop_flags=drop_flags, empty_intervals_flag=flagger.UNFLAGGED, **kwargs)
return data, flagger return data, flagger
@register @register
def harm_interpolate2Grid( def harm_interpolate2Grid(
data, field, flagger, freq, method, order=1, drop_flags=None, empty_intervals_flag=None, **kwargs, data, field, flagger, freq, method, order=1, drop_flags=None, **kwargs,
): ):
data, flagger = proc_fork(data, field, flagger) data, flagger = proc_fork(data, field, flagger)
data, flagger = proc_interpolateGrid(data, field, flagger, freq, method=method, inter_order=order, data, flagger = proc_interpolateGrid(data, field, flagger, freq, method=method, inter_order=order,
drop_flags=drop_flags, empty_intervals_flag=empty_intervals_flag, drop_flags=drop_flags, empty_intervals_flag=flagger.UNFLAGGED,
**kwargs) **kwargs)
return data, flagger return data, flagger
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment