Commit 0b120c09 authored by JOSSOUD Olivier's avatar JOSSOUD Olivier
Browse files

Merge remote-tracking branch 'origin/master'

parents 0a35881f 7f5b5592
Pipeline #118936 passed with stages
in 1 minute and 25 seconds
......@@ -252,8 +252,8 @@ def get_datasets_data(dataset: DatasetReader)\
encoder_df, iceblock_df, melting_df, conduct_df, pump_df, picarro_df, collector_df
"""
# Encoder
encoder_df = dataset.get_timeseries("ENCODER_periodic", "speed")
encoder_df = encoder_df.rename(columns={"value": "speed"})
encoder_df = dataset.get_timeseries("ENCODER_periodic")
encoder_df = encoder_df.drop(columns="speed_avg")
# Iceblock
iceblock_df = dataset.get_timeseries("ICBKCTRL_instant")
......@@ -316,7 +316,6 @@ def get_arrival_df(encoder_df: pd.DataFrame,
pd.DataFrame
Dataframe with arrival datetime at needle and Picarro.
"""
print(os.name)
if dataset is not None:
pkl_filename = os.path.join(dataset.binary_base_path, "arrival.pkl")
else:
......
# Absolute path of the base directory where the data files produced by the CFA are be stored.
base_data_path = /homel/ojossoud/Data/data_cfa/
base_data_path = /homel/ojossoud/_temp/data_cfa
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment