Skip to content

Commit 064fc00

Browse files
committed
eclab.mpr: Fix parsing of MB files (#222)
* add column 265 * Add 73 par MB technique. * tests * attribution.
1 parent cb244d1 commit 064fc00

File tree

8 files changed

+3744
-0
lines changed

8 files changed

+3744
-0
lines changed

docs/source/version.6_2.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ Bug fixes in ``yadg-next`` include:
2222
- Fixed metadata extraction in :mod:`yadg.extractors.eclab.mpt` so that multiple ``Comments:`` lines are concatenated instead of just the last line being kept.
2323
- Added further ``Set I/C`` parameters. Thanks to `@Locki3 <https://github.com/Locki3>`_ for providing test files.
2424
- 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.
25+
- Fixed parsing of various kinds of Modulo Bat files in :mod:`yadg.extractors.eclab.mpr`. Thank you to `@JohannesBaller <https://github.com/JohannesBaller>`_ for providing test files.

src/yadg/extractors/eclab/mpr_columns.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
217: ("<f4", "THD Ewe", "%"),
120120
241: ("<f4", "|E1|", "V"),
121121
242: ("<f4", "|E2|", "V"),
122+
265: ("<f4", "Ece", "V"),
122123
271: ("<f4", "Phase(Z1)", "deg"),
123124
272: ("<f4", "Analog IN 1", "V"),
124125
295: ("<u2", "I Range", None),

src/yadg/extractors/eclab/techniques.py

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,86 @@
912912
),
913913
{"11.50"},
914914
),
915+
(
916+
np.dtype(
917+
[
918+
("ctrl_type", "|u2"),
919+
("Apply I/C", "|u2"),
920+
("current/potential", "|u2"),
921+
("ctrl1_val", "<f4"),
922+
("ctrl1_val_unit", "|u1"),
923+
("ctrl1_val_vs", "|u4"),
924+
("ctrl2_val", "<f4"),
925+
("ctrl2_val_unit", "|u1"),
926+
("ctrl2_val_vs", "|u4"),
927+
("ctrl3_val", "<f4"),
928+
("ctrl3_val_unit", "|u1"),
929+
("ctrl3_val_vs", "|u4"),
930+
("N", "<f4"),
931+
("charge/discharge", "|u1"),
932+
("charge/discharge_1", "|u2"),
933+
("Apply I/C_1", "|u4"),
934+
("N1", "<f4"),
935+
("ctrl4_val", "<f4"),
936+
("ctrl4_val_unit", "|u2"),
937+
("ctrl5_val", "<f4"),
938+
("ctrl5_val_unit", "|u2"),
939+
("ctrl_tM", "|u4"),
940+
("ctrl_seq", "|u4"),
941+
("ctrl_repeat", "|u1"),
942+
("ctrl_trigger", "|u4"),
943+
("ctrl_TO_t", "<f4"),
944+
("ctrl_TO_t_unit", "|u1"),
945+
("ctrl_Nd", "|u4"),
946+
("ctrl_Na", "|u1"),
947+
("ctrl_corr", "|u4"),
948+
("lim_nb", "|u4"),
949+
("lim1_type", "|u1"),
950+
("lim1_comp", "|u1"),
951+
("lim1_Qprev_pct", "|u2"),
952+
("lim1_Q", "|u1"),
953+
("lim1_value", "<f4"),
954+
("lim1_value_unit", "|u1"),
955+
("lim1_action", "|u1"),
956+
("lim1_seq", "|u4"),
957+
("lim2_type", "|u1"),
958+
("lim2_comp", "|u1"),
959+
("lim2_Qprev_pct", "|u2"),
960+
("lim2_Q", "|u1"),
961+
("lim2_value", "<f4"),
962+
("lim2_value_unit", "|u1"),
963+
("lim2_action", "|u1"),
964+
("lim2_seq", "|u4"),
965+
("lim3_type", "|u1"),
966+
("lim3_comp", "|u1"),
967+
("lim3_Qprev_pct", "|u2"),
968+
("lim3_Q", "|u1"),
969+
("lim3_value", "<f4"),
970+
("lim3_value_unit", "|u1"),
971+
("lim3_action", "|u1"),
972+
("lim3_seq", "|u4"),
973+
("rec_nb", "|u1"),
974+
("rec1_type", "|u1"),
975+
("rec1_value", "<f4"),
976+
("rec1_value_unit", "|u1"),
977+
("rec2_type", "|u1"),
978+
("rec2_value", "<f4"),
979+
("rec2_value_unit", "|u1"),
980+
("rec3_type", "|u1"),
981+
("rec3_value", "<f4"),
982+
("rec3_value_unit", "|u1"),
983+
("E range min (V)", "<f4"),
984+
("E range max (V)", "<f4"),
985+
("I Range", "|u1"),
986+
("I Range min", "|u1"),
987+
("I Range max", "|u1"),
988+
("I Range init", "|u1"),
989+
("auto_rest", "|u4"),
990+
("Bandwidth", "|u1"),
991+
]
992+
),
993+
{"11.50"},
994+
),
915995
]
916996

917997

tests/test_x_eclab.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def compare_params(left, right):
5151
("mb", "en_US"),
5252
("mb.issue_95", "en_US"),
5353
("mb.issue_149", "de_DE"),
54+
("mb.issue_218", "en_US"),
5455
("mp.issue_183", "en_US"),
5556
("ocv", "en_US"),
5657
("ocv.issue_149", "de_DE"),
285 KB
Binary file not shown.
1010 KB
Binary file not shown.

tests/test_x_eclab/mb.issue_218.mpt

Lines changed: 3661 additions & 0 deletions
Large diffs are not rendered by default.
1.64 MB
Binary file not shown.

0 commit comments

Comments
 (0)