diff --git a/labsw/__init__.py b/labsw/__init__.py index c1402f9..bcd05f8 100644 --- a/labsw/__init__.py +++ b/labsw/__init__.py @@ -1 +1 @@ -__version__ = '0.1.7.1' +__version__ = '0.1.7.2' diff --git a/labsw/io.py b/labsw/io.py index b0efbeb..c21bcd6 100644 --- a/labsw/io.py +++ b/labsw/io.py @@ -42,7 +42,7 @@ def load_data_RH_logger(filepath, every=1): return df.iloc[::every] -def process_data_RH_logger(filepath, every, diff_period=1_000, SG_window=10_000): +def process_data_RH_logger(filepath, every, diff_period=1_000, SG_window_short=100, SG_window_long=10_000): df = load_data_RH_logger(filepath, every=1) df = df.drop(columns=['time']) @@ -56,10 +56,12 @@ def process_data_RH_logger(filepath, every, diff_period=1_000, SG_window=10_000) # Derivative delta = np.mean(df['time'].diff()) - df['dMdt_SG'] = savgol_filter(df['M'], window_length=SG_window, polyorder=1, deriv=1, delta=delta) + df['dMdt_SG_short'] = savgol_filter(df['M'], window_length=SG_window_short, polyorder=1, deriv=1, delta=delta) + df['dMdt_SG_long'] = savgol_filter(df['M'], window_length=SG_window_long, polyorder=1, deriv=1, delta=delta) df['dMdt_diff'] = df['M'].diff(periods=diff_period) / df['time'].diff(periods=diff_period) - df['dmdt_SG'] = savgol_filter(df['m'], window_length=SG_window, polyorder=1, deriv=1, delta=delta) + df['dmdt_SG_short'] = savgol_filter(df['m'], window_length=SG_window_short, polyorder=1, deriv=1, delta=delta) + df['dmdt_SG_long'] = savgol_filter(df['m'], window_length=SG_window_long, polyorder=1, deriv=1, delta=delta) df['dmdt_diff'] = df['m'].diff(periods=diff_period) / df['time'].diff(periods=diff_period) h5path = os.path.splitext(filepath)[0]