eclab.mpr: Add support for 11.50 CVA (#203)

* Add support for 11.50 CVA

* Docs.

docs/source/conf.py

@@ -21,7 +21,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "yadg"
-copyright = "2021 - 2024, yadg authors"
+copyright = "2021 - 2025, yadg authors"
 author = "Peter Kraus"
 release = version
 

docs/source/version.6_0.rst

@@ -1,9 +1,5 @@
 **yadg** version 6.0
-``````````````````````
-.. warning::
-
-   This version of yadg is not yet released.
-
+````````````````````
 .. image:: https://img.shields.io/static/v1?label=yadg&message=v6.0&color=blue&logo=github
   :target: https://github.com/PeterKraus/yadg/tree/6.0
 .. image:: https://img.shields.io/static/v1?label=yadg&message=v6.0&color=blue&logo=pypi

docs/source/version.6_1.rst

@@ -0,0 +1,25 @@
+**yadg** version 6.1
+````````````````````
+.. warning::
+
+   This version of yadg is not yet released.
+
+..
+  .. image:: https://img.shields.io/static/v1?label=yadg&message=v6.0&color=blue&logo=github
+    :target: https://github.com/PeterKraus/yadg/tree/6.0
+  .. image:: https://img.shields.io/static/v1?label=yadg&message=v6.0&color=blue&logo=pypi
+    :target: https://pypi.org/project/yadg/6.0/
+  .. image:: https://img.shields.io/static/v1?label=release%20date&message=2024-11-14&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-6.1`` are:
+
+
+Breaking changes in ``yadg-6.1`` are:
+
+
+Bug fixes in ``yadg-6.1`` include:
+
+  - Fixed metadata extraction and added support for another version of the CVA technique in :mod:`yadg.extractors.eclab.mpr`. Thanks to `@acavell <https://github.com/acavell>`_ for providing test files.

docs/source/version.rst

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

src/yadg/extractors/eclab/mpr.py

@@ -268,6 +268,7 @@ def process_settings(data: bytes, minver: str) -> tuple[dict, list]:
             # Handle NaNs and +/-Inf in params here
             if np.isnan(v) or np.isinf(v):
                 pardict[k] = str(v)
+        logger.debug("Parameters read are: %s", pardict)
         params.append(pardict)
     if len(params) > 0:
         params = {k: [d[k] for d in params] for k in params[0]}

src/yadg/extractors/eclab/techniques.py

@@ -258,8 +258,45 @@
                 ("dtf", "<f4"),
             ]
         ),
-        {"10.40", "11.50"},
-    )
+        {"10.40"},
+    ),
+    (
+        np.dtype(
+            [
+                ("Ei (V)", "<f4"),
+                ("Ei (V) vs.", "|u4"),
+                ("ti (h:m:s)", "<f4"),
+                ("dti (s)", "<f4"),
+                ("dE/dt", "<f4"),
+                ("dE/dt unit", "|u1"),
+                ("E1 (V)", "<f4"),
+                ("E1 (V) vs.", "|u4"),
+                ("t1 (h:m:s)", "<f4"),
+                ("dt1 (s)", "<f4"),
+                ("Step percent", "|u1"),
+                ("N", "|u4"),
+                ("E range min (V)", "<f4"),
+                ("E range max (V)", "<f4"),
+                ("I Range", "|u1"),
+                ("I Range min", "|u1"),
+                ("I Range max", "|u1"),
+                ("I Range init", "|u1"),
+                ("Bandwidth", "|u1"),
+                ("E2 (V)", "<f4"),
+                ("E2 (V) vs.", "|u4"),
+                ("t2 (h:m:s)", "<f4"),
+                ("dt2 (s)", "<f4"),
+                ("nc cycles", "|u4"),
+                ("nr", "|u4"),
+                ("Reverse Scan", "|u4"),
+                ("Ef (V)", "<f4"),
+                ("Ef (V) vs.", "|u4"),
+                ("tf (h:m:s)", "<f4"),
+                ("dtf (s)", "<f4"),
+            ]
+        ),
+        {"11.50"},
+    ),
 ]
 
 

tests/test_x_eclab.py

@@ -41,6 +41,7 @@ def compare_params(left, right):
         ("cv", "en_US"),
         ("cv.issue_149", "de_DE"),
         ("cva.issue_135", "en_US"),
+        ("cva.issue_202", "en_US"),
         ("gcpl", "en_US"),
         ("gcpl.issue_149", "de_DE"),
         ("geis", "en_US"),