Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions PyEIS/PyEIS_Data_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ def extract_mpt(path, EIS_name):
for j in range(len(EIS_test_header_names.columns)):
names_EIS.append(correct_text_EIS(EIS_test_header_names.columns[j])) #reads coloumn text
# return pd.read_csv(path+EIS_name, sep='\t', skiprows=int(EIS_init.err[0][18:20]), names=names_EIS, encoding='latin1')
return pd.read_csv(path+EIS_name, sep='\t', skiprows=int(EIS_init.err[0][18:-1]), names=names_EIS, encoding='latin1')
try:
return pd.read_csv(path+EIS_name, sep='\t', skiprows=int(EIS_init.err[0][18:-1]), names=names_EIS, encoding='latin1')
else:
return pd.read_csv(path+EIS_name, sep='\t', decimal=',', skiprows=int(EIS_init.err[0][18:-1]), names=names_EIS, encoding='latin1')

def extract_dta(path, EIS_name):
'''
Expand Down Expand Up @@ -144,4 +147,4 @@ def extract_solar(path, EIS_name):

#
#print()
#print('---> Data Extraction Script Loaded (v. 0.0.2 - 06/27/18)')
#print('---> Data Extraction Script Loaded (v. 0.0.2 - 06/27/18)')