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

Merge pull request #54 from bayesfactor/master

Browse Source 
Many new column types
This commit is contained in:
Chris Kerr
2020-10-31 08:47:19 +02:00
committed by GitHub
parent 995bcf3d71 5baa6f6a7f
commit db9b0c0669
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
galvani/BioLogic.py
View File

@@ -145,6 +145,7 @@ VMPdata_colID_dtype_map = {
9: ('Ece/V', '<f4'), 9: ('Ece/V', '<f4'),
11: ('I/mA', '<f8'), 11: ('I/mA', '<f8'),
13: ('(Q-Qo)/mA.h', '<f8'), 13: ('(Q-Qo)/mA.h', '<f8'),
16: ('Analog IN 1/V', '<f4'),
19: ('control/V', '<f4'), 19: ('control/V', '<f4'),
20: ('control/mA', '<f4'), 20: ('control/mA', '<f4'),
23: ('dQ/mA.h', '<f8'), # Same as 7? 23: ('dQ/mA.h', '<f8'), # Same as 7?
@@ -159,8 +160,10 @@ VMPdata_colID_dtype_map = {
39: ('I Range', '<u2'), 39: ('I Range', '<u2'),
70: ('P/W', '<f4'), 70: ('P/W', '<f4'),
74: ('Energy/W.h', '<f8'), 74: ('Energy/W.h', '<f8'),
75: ('Analog OUT/V', '<f4'),
76: ('<I>/mA', '<f4'), 76: ('<I>/mA', '<f4'),
77: ('<Ewe>/V', '<f4'), 77: ('<Ewe>/V', '<f4'),
78: ('Cs-2/µF-2', '<f4'),
96: ('|Ece|/V', '<f4'), 96: ('|Ece|/V', '<f4'),
98: ('Phase(Zce)/deg', '<f4'), 98: ('Phase(Zce)/deg', '<f4'),
99: ('|Zce|/Ohm', '<f4'), 99: ('|Zce|/Ohm', '<f4'),
@@ -171,9 +174,28 @@ VMPdata_colID_dtype_map = {
125: ('Capacitance charge/µF', '<f8'), 125: ('Capacitance charge/µF', '<f8'),
126: ('Capacitance discharge/µF', '<f8'), 126: ('Capacitance discharge/µF', '<f8'),
131: ('Ns', '<u2'), 131: ('Ns', '<u2'),
163: ('|Estack|/V', '<f4'),
168: ('Rcmp/Ohm', '<f4'), 168: ('Rcmp/Ohm', '<f4'),
169: ('Cs/µF', '<f4'), 169: ('Cs/µF', '<f4'),
172: ('Cp/µF', '<f4'), 172: ('Cp/µF', '<f4'),
173: ('Cp-2/µF-2', '<f4'),
241: ('|E1|/V', '<f4'),
242: ('|E2|/V', '<f4'),
271: ('Phase(Z1) / deg', '<f4'),
272: ('Phase(Z2) / deg', '<f4'),
301: ('|Z1|/Ohm', '<f4'),
302: ('|Z2|/Ohm', '<f4'),
331: ('Re(Z1)/Ohm', '<f4'),
332: ('Re(Z2)/Ohm', '<f4'),
361: ('-Im(Z1)/Ohm', '<f4'),
362: ('-Im(Z2)/Ohm', '<f4'),
391: ('<E1>/V', '<f4'),
392: ('<E2>/V', '<f4'),
422: ('Phase(Zstack)/deg', '<f4'),
423: ('|Zstack|/Ohm', '<f4'),
424: ('Re(Zstack)/Ohm', '<f4'),
425: ('-Im(Zstack)/Ohm', '<f4'),
426: ('<Estack>/V', '<f4'),
430: ('Phase(Zwe-ce)/deg', '<f4'), 430: ('Phase(Zwe-ce)/deg', '<f4'),
431: ('|Zwe-ce|/Ohm', '<f4'), 431: ('|Zwe-ce|/Ohm', '<f4'),
432: ('Re(Zwe-ce)/Ohm', '<f4'), 432: ('Re(Zwe-ce)/Ohm', '<f4'),
@@ -192,6 +214,18 @@ VMPdata_colID_dtype_map = {
477: ('NSD I/%', '<f4'), 477: ('NSD I/%', '<f4'),
479: ('NSR Ewe/%', '<f4'), 479: ('NSR Ewe/%', '<f4'),
480: ('NSR I/%', '<f4'), 480: ('NSR I/%', '<f4'),
486: ('|Ewe h2|/V', '<f4'),
487: ('|Ewe h3|/V', '<f4'),
488: ('|Ewe h4|/V', '<f4'),
489: ('|Ewe h5|/V', '<f4'),
490: ('|Ewe h6|/V', '<f4'),
491: ('|Ewe h7|/V', '<f4'),
492: ('|I h2|/A', '<f4'),
493: ('|I h3|/A', '<f4'),
494: ('|I h4|/A', '<f4'),
495: ('|I h5|/A', '<f4'),
496: ('|I h6|/A', '<f4'),
497: ('|I h7|/A', '<f4'),
} }
# These column IDs define flags which are all stored packed in a single byte # These column IDs define flags which are all stored packed in a single byte