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

Merge pull request #13 from bcolsen/add_columns

Browse Source 
Add some more columns
This commit is contained in:
Chris Kerr
2019-03-10 09:03:54 +01:00
committed by GitHub
parent 809f1df914 1904eb124d
commit c9320dacd7
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
galvani/BioLogic.py
View File

@@ -186,6 +186,8 @@ def VMPdata_dtype_from_colIDs(colIDs):
dtype_dict['(Q-Qo)/mA.h'] = '<f8' dtype_dict['(Q-Qo)/mA.h'] = '<f8'
elif colID == 19: elif colID == 19:
dtype_dict['control/V'] = '<f4' dtype_dict['control/V'] = '<f4'
elif colID == 20:
dtype_dict['control/mA'] = '<f4'
elif colID == 24: elif colID == 24:
dtype_dict['cycle number'] = '<f8' dtype_dict['cycle number'] = '<f8'
elif colID == 32: elif colID == 32:
@@ -206,6 +208,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 == 123:
dtype_dict['Energy charge/W.h'] = '<f8'
elif colID == 124:
dtype_dict['Energy discharge/W.h'] = '<f8'
elif colID == 125: elif colID == 125:
dtype_dict['Capacitance charge/µF'] = '<f8' dtype_dict['Capacitance charge/µF'] = '<f8'
elif colID == 126: elif colID == 126:
@@ -224,7 +230,20 @@ 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 == 473:
dtype_dict['THD Ewe/%'] = '<f4'
elif colID == 476:
dtype_dict['NSD Ewe/%'] = '<f4'
elif colID == 479:
dtype_dict['NSR Ewe/%'] = '<f4'
elif colID == 474:
dtype_dict['THD I/%'] = '<f4'
elif colID == 477:
dtype_dict['NSD I/%'] = '<f4'
elif colID == 480:
dtype_dict['NSR I/%'] = '<f4'
else: else:
print(dtype_dict)
raise NotImplementedError("column type %d not implemented" % colID) raise NotImplementedError("column type %d not implemented" % colID)
return np.dtype(list(dtype_dict.items())), flags_dict, flags2_dict return np.dtype(list(dtype_dict.items())), flags_dict, flags2_dict