Merge pull request #71 from GhostDeini/patch-1

Add more column types to BioLogic.py
echemdata · Nov 30, 2022 · e5a1b84 · e5a1b84
2 parents d6d2125 + 32ea152
commit e5a1b84
Showing 1 changed file with 12 additions and 3 deletions.
diff --git 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_)
@@ -233,6 +237,11 @@ def MPTfileCSV(file_or_path):
     495: ('|I h5|/A', '<f4'),
     496: ('|I h6|/A', '<f4'),
     497: ('|I h7|/A', '<f4'),
+    498: ('Q charge/mA.h', '<f8'),
+    499: ('Q discharge/mA.h', '<f8'),
+    500: ('step time/s', '<f8'),
+    501: ('Efficiency/%', '<f8'),
+    502: ('Capacity/mA.h', '<f8'),
 }
 
 # These column IDs define flags which are all stored packed in a single byte