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 branch 'cherry-pick-pr-3-dennissheberla'

Browse Source 
Since @dennissheberla did not make the changes requested in the review
of pull request #3, I have cherry-picked the changes I want to keep and
am now merging them to master manually.

Closes #3
This commit is contained in:
Chris Kerr
2017-04-22 13:56:54 +02:00
parent 3423fe7dc9 ebdb030f6a
commit c77b0a2444
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
galvani/BioLogic.py
View File

@@ -36,9 +36,7 @@ def fieldname_to_dtype(fieldname):
"|Ewe|/V", "|I|/A", "Phase(Z)/deg", "|Z|/Ohm", "|Ewe|/V", "|I|/A", "Phase(Z)/deg", "|Z|/Ohm",
"Re(Z)/Ohm", "-Im(Z)/Ohm"): "Re(Z)/Ohm", "-Im(Z)/Ohm"):
return (fieldname, np.float_) return (fieldname, np.float_)
# N.B. I'm not sure what 'Ns' is as in the only file I have with that elif fieldname in ("cycle number", "I Range", "Ns", "half cycle"):
# header it never has any value other than '0'
elif fieldname in ("cycle number", "I Range", "Ns"):
return (fieldname, np.int_) return (fieldname, np.int_)
elif fieldname in ("dq/mA.h", "dQ/mA.h"): elif fieldname in ("dq/mA.h", "dQ/mA.h"):
return ("dQ/mA.h", np.float_) return ("dQ/mA.h", np.float_)
@@ -167,10 +165,6 @@ def VMPdata_dtype_from_colIDs(colIDs):
flags_dict['counter inc.'] = (np.uint8(0x80), np.bool_) flags_dict['counter inc.'] = (np.uint8(0x80), np.bool_)
else: else:
raise NotImplementedError("flag %d not implemented" % colID) raise NotImplementedError("flag %d not implemented" % colID)
elif colID in (131,):
dtype_dict['flags2'] = '<u2'
if colID == 131:
flags2_dict['??'] = (np.uint16(0x0001), np.bool_)
elif colID == 4: elif colID == 4:
dtype_dict['time/s'] = '<f8' dtype_dict['time/s'] = '<f8'
elif colID == 5: elif colID == 5:
@@ -184,8 +178,12 @@ def VMPdata_dtype_from_colIDs(colIDs):
# 76 is <I>, 8 is either I or <I> ?? # 76 is <I>, 8 is either I or <I> ??
elif colID in (8, 76): elif colID in (8, 76):
dtype_dict['I/mA'] = '<f4' dtype_dict['I/mA'] = '<f4'
elif colID == 9:
dtype_dict['Ece/V'] = '<f4'
elif colID == 11: elif colID == 11:
dtype_dict['I/mA'] = '<f8' dtype_dict['I/mA'] = '<f8'
elif colID == 13:
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 == 24: elif colID == 24:
@@ -208,10 +206,20 @@ 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 == 125:
dtype_dict['Capacitance charge/µF'] = '<f8'
elif colID == 126:
dtype_dict['Capacitance discharge/µF'] = '<f8'
elif colID == 131:
dtype_dict['Ns'] = '<u2'
elif colID == 434: elif colID == 434:
dtype_dict['(Q-Qo)/C'] = '<f4' dtype_dict['(Q-Qo)/C'] = '<f4'
elif colID == 435: elif colID == 435:
dtype_dict['dQ/C'] = '<f4' dtype_dict['dQ/C'] = '<f4'
elif colID == 467:
dtype_dict['Q charge/discharge/mA.h'] = '<f8'
elif colID == 468:
dtype_dict['half cycle'] = '<u4'
else: else:
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