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

fixed setValueOnCopyOfASlice problem in flagSoilMoistureByPrecipitation function

parent dfb5a90a
No related branches found
No related tags found
No related merge requests found
...@@ -247,8 +247,10 @@ def flagSoilMoistureByPrecipitationEvents(data, flags, field, flagger, prec_refe ...@@ -247,8 +247,10 @@ def flagSoilMoistureByPrecipitationEvents(data, flags, field, flagger, prec_refe
periods = 2*int(24*60*60/moist_rate.n) periods = 2*int(24*60*60/moist_rate.n)
invalid_raises = ~ef.rolling(window='1D', closed='both', min_periods=periods)\ invalid_raises = ~ef.rolling(window='1D', closed='both', min_periods=periods)\
.apply(prec_test, raw=False).astype(bool) .apply(prec_test, raw=False).astype(bool)
# undo stacking heritage (only every second entrie actually is holding an information:
# apply calculated flagging mask invalid_raises = invalid_raises[1::2]
flags.loc[invalid_raises.values, field] = flagger.setFlag(flags.loc[invalid_raises.values, field], **kwargs) # retrieve indices referring to values-to-be-flagged-bad
invalid_indices = invalid_raises.index[invalid_raises]
return (data, flags) # set Flags
\ No newline at end of file flags.loc[invalid_indices, field] = flagger.setFlag(flags.loc[invalid_indices, field], **kwargs)
return (data, flags)
...@@ -113,5 +113,6 @@ def estimateSamplingRate(index): ...@@ -113,5 +113,6 @@ def estimateSamplingRate(index):
max_scnds = scnds_series.max() max_scnds = scnds_series.max()
min_scnds = scnds_series.min() min_scnds = scnds_series.min()
hist = np.histogram(scnds_series, range=(min_scnds, max_scnds + 1), bins=int(max_scnds - min_scnds + 1)) hist = np.histogram(scnds_series, range=(min_scnds, max_scnds + 1), bins=int(max_scnds - min_scnds + 1))
# return smallest non zero sample difference (this works, because input is expected to be harmonized) # return smallest non zero sample difference (this works, because input is expected to be at least
# harmonized with skips)
return pd.tseries.frequencies.to_offset(str(int(hist[1][:-1][hist[0] > 0].min())) + 's') return pd.tseries.frequencies.to_offset(str(int(hist[1][:-1][hist[0] > 0].min())) + 's')
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