Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/source/version.6_2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ 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.
- Fixed metadata extraction in :mod:`yadg.extractors.eclab.mpt` so that multiple ``Comments:`` lines are concatenated instead of just the last line being kept.
- Added further ``Set I/C`` parameters. Thanks to `@Locki3 <https://github.com/Locki3>`_ for providing test files.
- Fixed ``param format`` and ``data_column`` in CV files generated with EC-Lab version 11.50 using the :mod:`yadg.extractors.eclab.mpr` module. Thank you to J.N. Hausmann from Helmholtz-Zentrum Berlin für Materialien und Energie for providing the test files.
8 changes: 7 additions & 1 deletion src/yadg/extractors/eclab/mpt.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,18 @@

def process_settings(lines: list[str]) -> dict[str, str]:
settings = {}
comments = []
for line in lines:
items = [item.strip() for item in line.split(":")]
if len(items) > 2:
items = [items[0], ":".join(items[1:])]
if len(items) == 2 and items[1] != "":
settings[items[0]] = items[1]
if items[0] == "Comments":
comments.append(items[1])
else:
settings[items[0]] = items[1]
if len(comments) > 0:
settings["Comments"] = "\n".join(comments)
return settings


Expand Down
Binary file modified tests/test_x_eclab/gcpl.issue_211.mpt.pkl
Binary file not shown.
Binary file modified tests/test_x_eclab/ocv.mpt.pkl
Binary file not shown.
Binary file modified tests/test_x_eclab/vsp_ocv_wo.mpt.pkl
Binary file not shown.