chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 09:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve MPT parsing for the new test data file

Browse Source
This commit is contained in:
Chris Kerr
2022-09-10 22:33:29 +03:00
parent 54e5765264
commit 0ffdd2665e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
galvani/BioLogic.py
View File

@@ -26,10 +26,7 @@ def fieldname_to_dtype(fieldname):
elif fieldname in ("ox/red", "error", "control changes", "Ns changes", elif fieldname in ("ox/red", "error", "control changes", "Ns changes",
"counter inc."): "counter inc."):
return (fieldname, np.bool_) return (fieldname, np.bool_)
elif fieldname in ("time/s", "P/W", "(Q-Qo)/mA.h", "x", "control/V", elif fieldname in ("x", "control/V/mA", "Temperature/°C", "Efficiency/%"):
"control/V/mA", "(Q-Qo)/C", "dQ/C", "freq/Hz",
"|Ewe|/V", "|I|/A", "Phase(Z)/deg", "|Z|/Ohm",
"Re(Z)/Ohm", "-Im(Z)/Ohm"):
return (fieldname, np.float_) return (fieldname, np.float_)
elif fieldname in ("cycle number", "I Range", "Ns", "half cycle"): elif fieldname in ("cycle number", "I Range", "Ns", "half cycle"):
return (fieldname, np.int_) return (fieldname, np.int_)
@@ -37,8 +34,15 @@ def fieldname_to_dtype(fieldname):
return ("dQ/mA.h", np.float_) return ("dQ/mA.h", np.float_)
elif fieldname in ("I/mA", "<I>/mA"): elif fieldname in ("I/mA", "<I>/mA"):
return ("I/mA", np.float_) return ("I/mA", np.float_)
elif fieldname in ("Ewe/V", "<Ewe>/V"): elif fieldname in ("Ewe/V", "<Ewe>/V", "Ecell/V"):
return ("Ewe/V", np.float_) return ("Ewe/V", np.float_)
elif fieldname.endswith(("/s", "/Hz", "/deg",
"/W", "/mW", "/W.h", "/mW.h",
"/A", "/mA", "/A.h", "/mA.h",
"/V", "/mV",
"/F", "/mF", "/uF",
"/C", "/Ohm",)):
return (fieldname, np.float_)
else: else:
raise ValueError("Invalid column header: %s" % fieldname) raise ValueError("Invalid column header: %s" % fieldname)
@@ -62,7 +66,7 @@ def MPTfile(file_or_path, encoding='ascii'):
mpt_file = file_or_path mpt_file = file_or_path
magic = next(mpt_file) magic = next(mpt_file)
if magic != b'EC-Lab ASCII FILE\r\n': if magic not in (b'EC-Lab ASCII FILE\r\n', b'BT-Lab ASCII FILE\r\n'):
raise ValueError("Bad first line for EC-Lab file: '%s'" % magic) raise ValueError("Bad first line for EC-Lab file: '%s'" % magic)
nb_headers_match = re.match(rb'Nb header lines : (\d+)\s*$', nb_headers_match = re.match(rb'Nb header lines : (\d+)\s*$',