Add Set I/C values. (#212)

* fix mpt parsing

* add Set I/C values for mpr

* New test files

* docs

* add test files

Author: PeterKraus

docs/source/version.6_2.rst

@@ -0,0 +1,22 @@
+**yadg** version next
+`````````````````````
+..
+  .. image:: https://img.shields.io/static/v1?label=yadg&message=v6.1&color=blue&logo=github
+    :target: https://github.com/PeterKraus/yadg/tree/6.1
+  .. image:: https://img.shields.io/static/v1?label=yadg&message=v6.1&color=blue&logo=pypi
+    :target: https://pypi.org/project/yadg/6.1/
+  .. image:: https://img.shields.io/static/v1?label=release%20date&message=2025-06-03&color=red&logo=pypi
+
+
+Developed in the `ConCat Lab <https://tu.berlin/en/concat>`_ at Technische Universität Berlin (Berlin, DE).
+
+New features in ``yadg-next`` are:
+
+
+Breaking changes in ``yadg-next`` are:
+
+
+Bug fixes in ``yadg-next`` include:
+
+  - Fixed metadata extraction in :mod:`yadg.extractors.eclab.mpt` where ``control_*`` columns would not match the names present in the corresponding ``mpr`` files.
+  - Added further ``Set I/C`` parameters. Thanks to `@Locki3 <https://github.com/Locki3>`_ for providing test files.

docs/source/version.rst

@@ -1,6 +1,8 @@
 **yadg** version history
 ------------------------
 
+.. include:: version.6_2.rst
+
 .. include:: version.6_1.rst
 
 .. include:: version.6_0.rst

src/yadg/extractors/eclab/mpr.py

@@ -421,7 +421,7 @@ def process_data(
 
         if "control_V_I" in vals:
             icv = controls[Ns]
-            name = "control_I" if icv in {"I", "C"} else "control_V"  # f"control_{icv}"
+            name = "control_I" if icv in {"I", "C"} else "control_V"
             vals[name] = vals.pop("control_V_I")
             units[name] = "mA" if icv in {"I", "C"} else "V"
         devs = get_devs(vals=vals, units=units, Erange=Erange, Irange=Irange)

src/yadg/extractors/eclab/mpt.py

@@ -287,7 +287,7 @@ def process_data(
 
         if "control_VI" in vals:
             icv = controls[Ns] if isinstance(controls, list) else controls
-            name = f"control_{icv}"
+            name = "control_I" if icv in {"I", "C"} else "control_V"
             vals[name] = vals.pop("control_VI")
             units[name] = "mA" if icv in {"I", "C"} else "V"
         devs = get_devs(vals=vals, units=units, Erange=Erange, Irange=Irange, devs=devs)

src/yadg/extractors/eclab/mpt_columns.py

@@ -69,6 +69,12 @@
     "Efficiency/%": ("Efficiency", "%"),
     "Energy charge/W.h": ("Energy charge", "W·h"),
     "Energy discharge/W.h": ("Energy discharge", "W·h"),
+    "Energy ce charge/W.h": ("Energy ce charge", "W·h"),
+    "Energy ce discharge/W.h": ("Energy ce discharge", "W·h"),
+    "Energy we charge/W.h": ("Energy we charge", "W·h"),
+    "Energy we discharge/W.h": ("Energy we discharge", "W·h"),
+    "Energy we-ce charge/W.h": ("Energy we-ce charge", "W·h"),
+    "Energy we-ce discharge/W.h": ("Energy we-ce discharge", "W·h"),
     "Energy/W.h": ("Energy", "W·h"),
     "error": ("error", None),
     "Ewe-Ece/V": ("Ewe-Ece", "V"),
@@ -97,7 +103,9 @@
     "Phase(Z)/deg": ("Phase(Z)", "deg"),
     "Phase(Zce)/deg": ("Phase(Zce)", "deg"),
     "Phase(Zwe-ce)/deg": ("Phase(Zwe-ce)", "deg"),
+    "Pce/W": ("Pce", "W"),
     "Pwe/W": ("Pwe", "W"),
+    "Pwe-ce/W": ("Pwe-ce", "W"),
     "Q charge/discharge/mA.h": ("Q charge or discharge", "mA·h"),
     "Q charge/mA.h": ("Q charge", "mA·h"),
     "Q charge/mA.h/g": ("Q charge", "mA·h/g"),
@@ -115,6 +123,8 @@
     "Re(Zce)/Ohm": ("Re(Zce)", "Ω"),
     "Re(Zwe-ce)/Ohm": ("Re(Zwe-ce)", "Ω"),
     "Rwe/Ohm": ("Rwe", "Ω"),
+    "Rce/Ohm": ("Rce", "Ω"),
+    "Rwe-ce/Ohm": ("Rwe-ce", "Ω"),
     "step time/s": ("step time", "s"),
     "Tan(Delta)": ("Tan(Delta)", ""),
     "THD Ewe/%": ("THD Ewe", "%"),

src/yadg/extractors/eclab/techniques.py

@@ -1513,6 +1513,8 @@
     "Set I/C": (
         ("I", 0),
         ("C", 1),
+        ("C x N", 2),
+        ("C / N", 3),
     ),
     "Apply I/C": (
         ("I", 0),

tests/test_x_eclab.py

@@ -156,6 +156,7 @@ def test_eclab_consistency_partial_1(froot, locale, datadir):
     [
         ("gcpl.pr_182.1", "en_US"),
         ("gcpl.pr_182.2", "en_US"),
+        ("gcpl.issue_211", "en_US"),
     ],
 )
 def test_eclab_consistency_partial_2(froot, locale, datadir):
@@ -167,7 +168,7 @@ def test_eclab_consistency_partial_2(froot, locale, datadir):
     for key in aret.variables:
         if key.endswith("std_err"):
             continue
-        elif key in {"control_I"}:
+        elif key in {"control_I", "control_V", "Energy charge", "Energy discharge"}:
             continue
         try:
             xr.testing.assert_allclose(aret[key], bret[key])