Skip to content

Commit 465eeeb

Browse files
authored
Columns for modulo bat with EIS (#224)
* Add Energy we and z cycle columns * Add test data for modulo bat with EIS * Add comment to z cycle key Could be modulo or bitmasked to get the other z cycle key * Update mb.issue223 reference data Get different results using - yadg.extractors.extract("eclab.mpr", file... - yadg.extractors.eclab.mpr.extract(file) 2nd style is consistent with tests * Add mb.issue_223 to pytest
1 parent adee660 commit 465eeeb

File tree

7 files changed

+208
-0
lines changed

7 files changed

+208
-0
lines changed

src/yadg/extractors/eclab/mpr_columns.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
332: ("<f4", "Re(Z2)", "Ω"),
131131
361: ("<f4", "-Im(Z1)", "Ω"),
132132
362: ("<f4", "-Im(Z2)", "Ω"),
133+
368: ("<f8", "Energy we", "W·h"),
133134
379: ("<f8", "Energy charge", "W·h"),
134135
391: ("<f4", "<E1>", "V"),
135136
392: ("<f4", "<E2>", "V"),
@@ -177,6 +178,7 @@
177178
501: ("<f4", "|Ece h5|", "V"),
178179
502: ("<f4", "|Ece h6|", "V"),
179180
503: ("<f4", "|Ece h7|", "V"),
181+
981: ("<u4", "z cycle", None), # 981 % 512 = 469, also z cycle
180182
}
181183

182184

src/yadg/extractors/eclab/mpt_columns.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
"Ece/V": ("Ece", "V"),
6868
"Ecell/V": ("Ecell", "V"),
6969
"Efficiency/%": ("Efficiency", "%"),
70+
"Energy we/W.h": ("Energy we", "W·h"),
7071
"Energy charge/W.h": ("Energy charge", "W·h"),
7172
"Energy discharge/W.h": ("Energy discharge", "W·h"),
7273
"Energy ce charge/W.h": ("Energy ce charge", "W·h"),

tests/test_x_eclab.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def compare_params(left, right):
6464
("mb.issue_95", "en_US"),
6565
("mb.issue_149", "de_DE"),
6666
("mb.issue_218", "en_US"),
67+
("mb.issue_223", "en_GB"),
6768
("mp.issue_183", "en_US"),
6869
("ocv", "en_US"),
6970
("ocv.issue_149", "de_DE"),
26.6 KB
Binary file not shown.
37.2 KB
Binary file not shown.

tests/test_x_eclab/mb.issue_223.mpt

Lines changed: 204 additions & 0 deletions
Large diffs are not rendered by default.
109 KB
Binary file not shown.

0 commit comments

Comments
 (0)