chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 01:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from chatcannon/add-column-R-Ohm

Browse Source 
Add column IDs for 'R/Ohm' and 'Rapp/Ohm'
This commit is contained in:
Chris Kerr
2021-08-31 18:19:09 +03:00
committed by GitHub
parent dd605e8fd3 de182bd400
commit 7ef5be147b
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
galvani/BioLogic.py
View File

@@ -154,6 +154,7 @@ VMPdata_colID_dtype_map = {
20: ('control/mA', '<f4'), 20: ('control/mA', '<f4'),
23: ('dQ/mA.h', '<f8'), # Same as 7? 23: ('dQ/mA.h', '<f8'), # Same as 7?
24: ('cycle number', '<f8'), 24: ('cycle number', '<f8'),
26: ('Rapp/Ohm', '<f4'),
32: ('freq/Hz', '<f4'), 32: ('freq/Hz', '<f4'),
33: ('|Ewe|/V', '<f4'), 33: ('|Ewe|/V', '<f4'),
34: ('|I|/A', '<f4'), 34: ('|I|/A', '<f4'),
@@ -162,6 +163,7 @@ VMPdata_colID_dtype_map = {
37: ('Re(Z)/Ohm', '<f4'), 37: ('Re(Z)/Ohm', '<f4'),
38: ('-Im(Z)/Ohm', '<f4'), 38: ('-Im(Z)/Ohm', '<f4'),
39: ('I Range', '<u2'), 39: ('I Range', '<u2'),
69: ('R/Ohm', '<f4'),
70: ('P/W', '<f4'), 70: ('P/W', '<f4'),
74: ('Energy/W.h', '<f8'), 74: ('Energy/W.h', '<f8'),
75: ('Analog OUT/V', '<f4'), 75: ('Analog OUT/V', '<f4'),

1
tests/test_BioLogic.py
View File

@@ -87,6 +87,7 @@ def test_colID_to_dtype(colIDs, expected):
('bio_logic6.mpr', '2012-09-11', None), ('bio_logic6.mpr', '2012-09-11', None),
# C019P-0ppb-A_C01.mpr stores the date in a different format # C019P-0ppb-A_C01.mpr stores the date in a different format
('C019P-0ppb-A_C01.mpr', '2019-03-14', '2019-03-14'), ('C019P-0ppb-A_C01.mpr', '2019-03-14', '2019-03-14'),
('Rapp_Error.mpr', '2010-12-02', '2010-12-02'),
]) ])
def test_MPR_dates(testdata_dir, filename, startdate, enddate): def test_MPR_dates(testdata_dir, filename, startdate, enddate):
"""Check that the start and end dates in .mpr files are read correctly.""" """Check that the start and end dates in .mpr files are read correctly."""