11.50 mpt pass

src/yadg/extractors/eclab/common/mpt_columns.py

@@ -12,13 +12,26 @@
     "(Q-Qo)/mA.h": ("(Q-Qo)", "mA·h"),
     "<Ece>/V": ("<Ece>", "V"),
     "<Ewe>/V": ("<Ewe>", "V"),
+    "<Ewe/V>": ("<Ewe>", "V"),
     "<I>/mA": ("<I>", "mA"),
     "|C|/nF": ("|C|", "nF"),
     "|Conductivity|/mS/cm": ("|Conductivity|", "mS/cm"),
     "|Ece|/V": ("|Ece|", "V"),
     "|Energy|/W.h": ("|Energy|", "W·h"),
     "|Ewe|/V": ("|Ewe|", "V"),
+    "|Ewe h2|/V": ("|Ewe h2|", "V"),
+    "|Ewe h3|/V": ("|Ewe h3|", "V"),
+    "|Ewe h4|/V": ("|Ewe h4|", "V"),
+    "|Ewe h5|/V": ("|Ewe h5|", "V"),
+    "|Ewe h6|/V": ("|Ewe h6|", "V"),
+    "|Ewe h7|/V": ("|Ewe h7|", "V"),
     "|I|/A": ("|I|", "A"),
+    "|I h2|/A": ("|I h2|", "A"),
+    "|I h3|/A": ("|I h3|", "A"),
+    "|I h4|/A": ("|I h4|", "A"),
+    "|I h5|/A": ("|I h5|", "A"),
+    "|I h6|/A": ("|I h6|", "A"),
+    "|I h7|/A": ("|I h7|", "A"),
     "|M|": ("|M|", ""),
     "|Permittivity|": ("|Permittivity|", ""),
     "|Resistivity|/Ohm.cm": ("|Resistivity|", "Ω·cm"),

src/yadg/extractors/eclab/common/techniques.py

@@ -234,7 +234,7 @@
             ("goto_Ns", "u4"),
             ("nc_cycles", "u4"),
         ]
-    )
+    ),
 ]
 
 

src/yadg/extractors/eclab/mpr.py

@@ -294,15 +294,15 @@ def process_settings(data: bytes) -> tuple[dict, list]:
         count=ns,
     )
     pardicts = [dict(zip(value.dtype.names, value.item())) for value in rawparams]
-   # print(f"{[i['set_I/C'] for i in pardicts]=}")
-   # print(f"{[i['Is'] for i in pardicts]=}")
-   # print(f"{[i['Is_unit'] for i in pardicts]=}")
-   # print(f"{[i['Is_vs'] for i in pardicts]=}")
-   # print(f"{[i['N'] for i in pardicts]=}")
-   # print(f"{[i['I_sign'] for i in pardicts]=}")
-   # print(f"{[i['t1'] for i in pardicts]=}")
-   # print(f"{[i['I_range'] for i in pardicts]=}")
-   # print(f"{[i['bandwidth'] for i in pardicts]=}")
+    # print(f"{[i['set_I/C'] for i in pardicts]=}")
+    # print(f"{[i['Is'] for i in pardicts]=}")
+    # print(f"{[i['Is_unit'] for i in pardicts]=}")
+    # print(f"{[i['Is_vs'] for i in pardicts]=}")
+    # print(f"{[i['N'] for i in pardicts]=}")
+    # print(f"{[i['I_sign'] for i in pardicts]=}")
+    # print(f"{[i['t1'] for i in pardicts]=}")
+    # print(f"{[i['I_range'] for i in pardicts]=}")
+    # print(f"{[i['bandwidth'] for i in pardicts]=}")
     params = []
     for pardict in pardicts:
         for k, v in pardict.items():
@@ -409,7 +409,7 @@ def process_data(
     data_dtype = np.dtype(list(zip(namelist, dtypelist)))
     # Depending on module version, datapoints start at different offsets.
     if version == 0:
-        offset = 0x3ef
+        offset = 0x3EF
     elif version == 2:
         offset = 0x195
     elif version == 3:

src/yadg/extractors/eclab/mpt.py

@@ -244,7 +244,7 @@ def process_data(
                     sval = value.strip()
                     vals[name] = sval
 
-        Ns  = vals.get("Ns", 0)
+        Ns = vals.get("Ns", 0)
         Erange = Eranges[Ns] if isinstance(Eranges, list) else Eranges
         Irstr = Iranges[Ns] if isinstance(Iranges, list) else Iranges
         if "I Range" in vals:

tests/test_x_eclab_mpt.py

@@ -14,17 +14,22 @@
         ("ca.issue_149.mpt", "de_DE"),
         ("cp.mpt", "en_GB"),
         ("cp.issue_61.mpt", "en_GB"),
+        ("cp.issue_149.mpt", "de_DE"),
         ("cv.mpt", "en_GB"),
         ("cv.issue_149.mpt", "de_DE"),
         ("cva.issue_135.mpt", "en_GB"),
         ("gcpl.mpt", "en_GB"),
         ("gcpl.issue_149.mpt", "de_DE"),
         ("geis.mpt", "en_GB"),
+        ("geis.issue_149.mpt", "de_DE"),
         ("lsv.mpt", "en_GB"),
         ("mb.mpt", "en_GB"),
         ("mb.issue_95.mpt", "en_GB"),
+        ("mb.issue_149.mpt", "de_DE"),
         ("ocv.mpt", "en_GB"),
+        ("ocv.issue_149.mpt", "de_DE"),
         ("peis.mpt", "en_GB"),
+        ("peis.issue_149.mpt", "de_DE"),
         ("wait.mpt", "en_GB"),
         ("zir.mpt", "en_GB"),
         ("vsp_ocv_with.mpt", "en_GB"),