diff --git a/BioLogic.py b/BioLogic.py index 87a245e..76c689c 100644 --- a/BioLogic.py +++ b/BioLogic.py @@ -30,15 +30,19 @@ def fieldname_to_dtype(fieldname): elif fieldname in ("ox/red", "error", "control changes", "Ns changes", "counter inc."): return (fieldname, np.bool_) - elif fieldname in ("time/s", "Ewe/V", "P/W", "(Q-Qo)/mA.h", "x", - "control/V", "control/V/mA", "(Q-Qo)/C"): + elif fieldname in ("time/s", "P/W", "(Q-Qo)/mA.h", "x", "control/V", + "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_) - elif fieldname in ("cycle number",): + elif fieldname in ("cycle number", "I Range"): return (fieldname, np.int_) elif fieldname in ("dq/mA.h", "dQ/mA.h"): return ("dQ/mA.h", np.float_) elif fieldname in ("I/mA", "/mA"): return ("I/mA", np.float_) + elif fieldname in ("Ewe/V", "/V"): + return ("Ewe/V", np.float_) else: raise ValueError("Invalid column header: %s" % fieldname) @@ -158,12 +162,14 @@ def VMPdata_dtype_from_colIDs(colIDs): dtype_dict['time/s'] = ', I don't see the difference + elif colID in (6, 77): dtype_dict['Ewe/V'] = ', 8 is either I or ?? + elif colID in (8, 76): dtype_dict['I/mA'] = '