From 32ea152ccf42e8fc4705f8bdb65214f91b148ab6 Mon Sep 17 00:00:00 2001 From: GhostDeini <45671983+GhostDeini@users.noreply.github.com> Date: Mon, 30 May 2022 16:31:24 +0200 Subject: [PATCH] Update BioLogic.py Added "control/mA", "Q charge/discharge/mA.h", "step time/s", "Q charge/mA.h", "Q discharge/mA.h", "Efficiency/%", "Capacity/mA.h" to possible fieldnames in fieldname_to_dtype(fieldname). Also in VMPdata_colID_dtype_map. --- galvani/BioLogic.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py index 5e6e92f..94d3d23 100644 --- a/galvani/BioLogic.py +++ b/galvani/BioLogic.py @@ -27,9 +27,13 @@ def fieldname_to_dtype(fieldname): "counter inc."): return (fieldname, np.bool_) 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"): + "control/mA", "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 ("Q charge/discharge/mA.h", "step time/s", + "Q charge/mA.h", "Q discharge/mA.h", + "Efficiency/%", "Capacity/mA.h") return (fieldname, np.float_) elif fieldname in ("cycle number", "I Range", "Ns", "half cycle"): return (fieldname, np.int_) @@ -232,6 +236,11 @@ def MPTfileCSV(file_or_path): 495: ('|I h5|/A', '