Skip to content

eclab.mpr: Add MB columns 878, 893. #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PeterKraus merged 3 commits into from
Aug 13, 2025
Merged

eclab.mpr: Add MB columns 878, 893. #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5f9468
Add missing header names
PeterKraus Aug 13, 2025
d120727
New columns issue_231
PeterKraus Aug 13, 2025
0e841b4
Fix column conflict.
PeterKraus Aug 13, 2025
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
5 changes: 4 additions & 1 deletion src/yadg/extractors/eclab/mpr_columns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
169: ("<f4", "Cs", "µF"),
172: ("<f4", "Cp", "µF"),
173: ("<f4", "Cp⁻²", "µF⁻²"),
174: ("<f4", "<Ewe>", "V"), # This column may conflict with ID 77.
174: ("<f4", "<Ewe>", "V"), # This column may conflict with ID 77 and 6.
178: ("<f4", "(Q-Qo)", "C"),
179: ("<f4", "dQ", "C"),
182: ("<f8", "step time", "s"),
Expand Down Expand Up @@ -181,15 +181,18 @@
501: ("<f4", "|Ece h5|", "V"),
502: ("<f4", "|Ece h6|", "V"),
503: ("<f4", "|Ece h7|", "V"),
878: ("<f8", "Energy ce", "W·h"),
884: ("<f8", "Energy ce discharge", "W·h"),
893: ("<f8", "Capacitance charge", "µF"),
981: ("<u4", "z cycle", None), # 981 % 512 = 469, also z cycle
983: ("<f4", "<Ece>", "V"), # 983 % 512 = 471, also <Ece>
}

# Conflict resolution map. If both the outer and inner column ID are present,
# the meaning of the outer column ID is set to the entry below.
conflict_columns = {
174: {
6: ("<f4", "Phase(Zwe-ce)", "deg"),
77: ("<f4", "Phase(Zwe-ce)", "deg"),
},
}
Expand Down
2 changes: 2 additions & 0 deletions src/yadg/extractors/eclab/mpt_columns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,15 @@
"Ece/V": ("Ece", "V"),
"Ecell/V": ("Ecell", "V"),
"Efficiency/%": ("Efficiency", "%"),
"Energy ce/W.h": ("Energy ce", "W·h"),
"Energy we/W.h": ("Energy we", "W·h"),
"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/W.h": ("Energy we-ce", "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"),
Expand Down
Loading