rasmus/nafuma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return summary as separte chg / dchg dataframes

Browse source
This commit is contained in:
rasmusvt 2022-08-01 17:00:10 +02:00
parent 0699399d1a
commit 224d05e0e9
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nafuma/electrochemistry/io.py
View file

@ -52,7 +52,6 @@ def read_neware(path, options={}):
elif path.endswith('csv'): elif path.endswith('csv'):
df = pd.read_csv(path) df = pd.read_csv(path)
return df return df
@ -243,10 +242,6 @@ def splice_cycles(df, options: dict) -> pd.DataFrame:
df[column].loc[df['steps'] == steps_indices[1]] += add df[column].loc[df['steps'] == steps_indices[1]] += add
return df return df
@ -297,14 +292,13 @@ def process_neware_data(df, options={}):
# Initiate cycles list # Initiate cycles list
cycles = [] cycles = []
# Loop through all the cycling steps, change the current and capacities in the # Loop through all the cycling steps, change the current and capacities in the
for i in range(df["cycle"].max()): for i in range(df["cycle"].max()):
sub_df = df.loc[df['cycle'] == i+1].copy() sub_df = df.loc[df['cycle'] == i+1].copy()
#sub_df.loc[dchg_mask, 'current'] *= -1
#sub_df.loc[dchg_mask, 'capacity'] *= -1
chg_df = sub_df.loc[chg_mask] chg_df = sub_df.loc[chg_mask]
dchg_df = sub_df.loc[dchg_mask] dchg_df = sub_df.loc[dchg_mask]
@ -328,6 +322,7 @@ def process_neware_data(df, options={}):
cycles.append((chg_df, dchg_df)) cycles.append((chg_df, dchg_df))
return cycles return cycles
@ -341,7 +336,13 @@ def process_neware_data(df, options={}):
if options['splice_cycles']: if options['splice_cycles']:
df = splice_cycles(df=df, options=options) df = splice_cycles(df=df, options=options)
return df
chg_df = df.loc[df['status'] == 'CC Chg']
dchg_df = df.loc[df['status'] == 'CC DChg']
cycles = [chg_df, dchg_df]
return cycles