Skip to content

Commit

Permalink
Refine params dtype (#196)
Browse files Browse the repository at this point in the history
* Refine param_dtype for lsv, geis, peis

* Formatting

* Extend contributors list

* Change inc cycle to |u1 for peis and geis

* Add test files

* Add test and adapt data_columns

* Remove commented line
  • Loading branch information
carla-terboven authored Nov 1, 2024
1 parent 1f77294 commit 0b1f8d4
Show file tree
Hide file tree
Showing 8 changed files with 1,105 additions and 9 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ More detailed [usage instructions](https://dgbowl.github.io/yadg/main/usage.html
### Contributors:
- [Peter Kraus](http://github.com/PeterKraus)
- [Nicolas Vetsch](http://github.com/vetschn)
- [Carla Terboven](https://github.com/carla-terboven)

### Acknowledgements
This project has received funding from the following sources:
Expand Down
3 changes: 2 additions & 1 deletion src/yadg/extractors/eclab/mpr_columns.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,13 @@
178: ("<f4", "(Q-Qo)", "C"),
179: ("<f4", "dQ", "C"),
182: ("<f8", "step time", "s"),
185: ("<f4", "<Ece>", "V"),
211: ("<f8", "Q charge or discharge", "C"),
217: ("<f4", "THD Ewe", "%"),
241: ("<f4", "|E1|", "V"),
242: ("<f4", "|E2|", "V"),
271: ("<f4", "Phase(Z1)", "deg"),
272: ("<f4", "Phase(Z2)", "deg"),
272: ("<f4", "Analog IN 1", "V"),
295: ("<u2", "I Range", None),
301: ("<f4", "|Z1|", "Ω"),
302: ("<f4", "|Z2|", "Ω"),
Expand Down
46 changes: 38 additions & 8 deletions src/yadg/extractors/eclab/techniques.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
("nc cycles", "|u4"),
("goto Ns'", "|u4"),
("nr cycles", "|u4"),
("inc. cycle", "|u4"),
("inc. cycle", "|u1"),
]
),
{"10.40"},
Expand Down Expand Up @@ -502,7 +502,7 @@
("nc cycles", "|u4"),
("goto Ns'", "|u4"),
("nr cycles", "|u4"),
("inc. cycle", "|u4"),
("inc. cycle", "|u1"),
]
),
{"11.50"},
Expand Down Expand Up @@ -540,8 +540,38 @@
("Bandwidth", "|u1"),
]
),
{"10.40", "11.50"},
)
{"10.40"},
),
(
np.dtype(
[
("tR (h:m:s)", "<f4"),
("dER/dt (mV/h)", "<f4"),
("dER (mV)", "<f4"),
("dtR (s)", "<f4"),
("dE/dt", "<f4"),
("dE/dt unit", "|u1"),
("Ei (V)", "<f4"),
("Ei (V) vs.", "|u4"),
("EL (V)", "<f4"),
("EL (V) vs.", "|u4"),
("record", "|u1"),
("dI", "<f4"),
("unit dI", "|u1"),
("tI (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"),
]
),
{"11.50"},
),
]


Expand Down Expand Up @@ -930,17 +960,17 @@
("nc cycles", "|u4"),
("goto Ns'", "|u4"),
("nr cycles", "|u4"),
("inc. cycle", "|u4"),
("inc. cycle", "|u1"),
]
),
{"10.40"},
),
(
np.dtype(
[
("Mode", "|u4"),
("Mode", "|u1"),
("E (V)", "<f4"),
("E (V) vs.", "|u1"),
("E (V) vs.", "|u4"),
("tE (h:m:s)", "<f4"),
("record", "|u1"),
("dI", "<f4"),
Expand Down Expand Up @@ -989,7 +1019,7 @@
("nc cycles", "|u4"),
("goto Ns'", "|u4"),
("nr cycles", "|u4"),
("inc. cycle", "|u4"),
("inc. cycle", "|u1"),
]
),
{"11.50"},
Expand Down
1 change: 1 addition & 0 deletions tests/test_x_eclab.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def compare_params(left, right):
("gcpl.issue_149", "de_DE"),
("geis", "en_US"),
("lsv", "en_US"),
("lsv.issue_195", "en_US"),
("mb", "en_US"),
("mb.issue_95", "en_US"),
("mb.issue_149", "de_DE"),
Expand Down
Binary file added tests/test_x_eclab/lsv.issue_195.mpr
Binary file not shown.
Binary file added tests/test_x_eclab/lsv.issue_195.mpr.pkl
Binary file not shown.
1,063 changes: 1,063 additions & 0 deletions tests/test_x_eclab/lsv.issue_195.mpt

Large diffs are not rendered by default.

Binary file added tests/test_x_eclab/lsv.issue_195.mpt.pkl
Binary file not shown.

0 comments on commit 0b1f8d4

Please sign in to comment.