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 #19 from bayesfactor/patch-2

Browse Source 
new column types
This commit is contained in:
Chris Kerr
2019-03-16 11:53:17 +01:00
committed by GitHub
parent da67a36308 880b4a0a2d
commit 4365c08e8b
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
galvani/BioLogic.py
View File

@@ -184,6 +184,8 @@ def VMPdata_dtype_from_colIDs(colIDs):
dtype_dict['I/mA'] = '<f8' dtype_dict['I/mA'] = '<f8'
elif colID == 13: elif colID == 13:
dtype_dict['(Q-Qo)/mA.h'] = '<f8' dtype_dict['(Q-Qo)/mA.h'] = '<f8'
elif colID == 16:
dtype_dict['Analog IN 1/V'] = '<f4'
elif colID == 19: elif colID == 19:
dtype_dict['control/V'] = '<f4' dtype_dict['control/V'] = '<f4'
elif colID == 20: elif colID == 20:
@@ -208,6 +210,10 @@ def VMPdata_dtype_from_colIDs(colIDs):
dtype_dict['I Range'] = '<u2' dtype_dict['I Range'] = '<u2'
elif colID == 70: elif colID == 70:
dtype_dict['P/W'] = '<f4' dtype_dict['P/W'] = '<f4'
elif colID == 74:
dtype_dict['Energy/W.h'] = '<f8'
elif colID == 78:
dtype_dict['Cs-2/µf-2'] = '<f4'
elif colID == 123: elif colID == 123:
dtype_dict['Energy charge/W.h'] = '<f8' dtype_dict['Energy charge/W.h'] = '<f8'
elif colID == 124: elif colID == 124:
@@ -222,6 +228,8 @@ def VMPdata_dtype_from_colIDs(colIDs):
dtype_dict['Cs/µF'] = '<f4' dtype_dict['Cs/µF'] = '<f4'
elif colID == 172: elif colID == 172:
dtype_dict['Cp/µF'] = '<f4' dtype_dict['Cp/µF'] = '<f4'
elif colID == 173:
dtype_dict['Cp-2/µF-2'] = '<f4'
elif colID == 434: elif colID == 434:
dtype_dict['(Q-Qo)/C'] = '<f4' dtype_dict['(Q-Qo)/C'] = '<f4'
elif colID == 435: elif colID == 435:
@@ -230,6 +238,8 @@ def VMPdata_dtype_from_colIDs(colIDs):
dtype_dict['Q charge/discharge/mA.h'] = '<f8' dtype_dict['Q charge/discharge/mA.h'] = '<f8'
elif colID == 468: elif colID == 468:
dtype_dict['half cycle'] = '<u4' dtype_dict['half cycle'] = '<u4'
elif colID == 469:
dtype_dict['z cycle'] = '<u4'
elif colID == 473: elif colID == 473:
dtype_dict['THD Ewe/%'] = '<f4' dtype_dict['THD Ewe/%'] = '<f4'
elif colID == 476: elif colID == 476: