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 #36 from bcolsen/version3

Browse Source 
Added initial support for VMP data module version 3
This commit is contained in:
Chris Kerr
2019-10-08 22:22:37 +02:00
committed by GitHub
parent 0c0b48ddcc 72d79146e6
commit a74a0267c2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
galvani/BioLogic.py
View File

@@ -180,6 +180,7 @@ VMPdata_colID_dtype_map = {
172: ('Cp/µF', '<f4'), 172: ('Cp/µF', '<f4'),
434: ('(Q-Qo)/C', '<f4'), 434: ('(Q-Qo)/C', '<f4'),
435: ('dQ/C', '<f4'), 435: ('dQ/C', '<f4'),
441: ('<Ecv>/V', '<f4'),
467: ('Q charge/discharge/mA.h', '<f8'), 467: ('Q charge/discharge/mA.h', '<f8'),
468: ('half cycle', '<u4'), 468: ('half cycle', '<u4'),
473: ('THD Ewe/%', '<f4'), 473: ('THD Ewe/%', '<f4'),
@@ -327,12 +328,16 @@ class MPRfile:
count=n_columns) count=n_columns)
remaining_headers = data_module['data'][5 + n_columns:100] remaining_headers = data_module['data'][5 + n_columns:100]
main_data = data_module['data'][100:] main_data = data_module['data'][100:]
elif data_module['version'] == 2: elif data_module['version'] in [2, 3]:
column_types = np.frombuffer(data_module['data'][5:], dtype='<u2', column_types = np.frombuffer(data_module['data'][5:], dtype='<u2',
count=n_columns) count=n_columns)
# There is 405 bytes of data before the main array starts # There are bytes of data before the main array starts
if data_module['version'] == 3:
num_bytes_before = 406 # version 3 added `\x01` to the start
else:
num_bytes_before = 405
remaining_headers = data_module['data'][5 + 2 * n_columns:405] remaining_headers = data_module['data'][5 + 2 * n_columns:405]
main_data = data_module['data'][405:] main_data = data_module['data'][num_bytes_before:]
else: else:
raise ValueError("Unrecognised version for data module: %d" % raise ValueError("Unrecognised version for data module: %d" %
data_module['version']) data_module['version'])