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

"control/V" and "control/V/mA" are different

Browse Source 
No longer forcing them both to "control/V/mA"
This commit is contained in:
Chris Kerr
2013-12-11 11:48:15 +00:00
parent 6a63196a67
commit 3483195228
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BioLogic.py
View File

@@ -22,14 +22,13 @@ def fieldname_to_dtype(fieldname):
elif fieldname in ("ox/red", "error", "control changes", "Ns changes", elif fieldname in ("ox/red", "error", "control changes", "Ns changes",
"counter inc."): "counter inc."):
return (fieldname, np.bool_) return (fieldname, np.bool_)
elif fieldname in ("time/s", "Ewe/V", "P/W", "(Q-Qo)/mA.h", "x"): elif fieldname in ("time/s", "Ewe/V", "P/W", "(Q-Qo)/mA.h", "x",
"control/V", "control/V/mA"):
return (fieldname, np.float_) return (fieldname, np.float_)
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_)
elif fieldname in ("I/mA", "<I>/mA"): elif fieldname in ("I/mA", "<I>/mA"):
return ("I/mA", np.float_) return ("I/mA", np.float_)
elif fieldname in ("control/V", "control/V/mA"):
return ("control/V/mA", np.float_)
else: else:
raise ValueError("Invalid column header: %s" % fieldname) raise ValueError("Invalid column header: %s" % fieldname)
@@ -65,6 +64,9 @@ def MPTfile(file_or_path):
["mode", "ox/red", "error", "control changes", "Ns changes", ["mode", "ox/red", "error", "control changes", "Ns changes",
"counter inc.", "time/s", "control/V/mA", "Ewe/V", "dq/mA.h", "counter inc.", "time/s", "control/V/mA", "Ewe/V", "dq/mA.h",
"P/W", "<I>/mA", "(Q-Qo)/mA.h", "x"], "P/W", "<I>/mA", "(Q-Qo)/mA.h", "x"],
['mode', 'ox/red', 'error', 'control changes', 'Ns changes',
'counter inc.', 'time/s', 'control/V', 'Ewe/V', 'dq/mA.h',
'<I>/mA', '(Q-Qo)/mA.h', 'x'],
["mode", "ox/red", "error", "control changes", "Ns changes", ["mode", "ox/red", "error", "control changes", "Ns changes",
"counter inc.", "time/s", "control/V", "Ewe/V", "I/mA", "counter inc.", "time/s", "control/V", "Ewe/V", "I/mA",
"dQ/mA.h", "P/W"], "dQ/mA.h", "P/W"],
@@ -113,6 +115,9 @@ def MPTfileCSV(file_or_path):
["mode", "ox/red", "error", "control changes", "Ns changes", ["mode", "ox/red", "error", "control changes", "Ns changes",
"counter inc.", "time/s", "control/V/mA", "Ewe/V", "dq/mA.h", "counter inc.", "time/s", "control/V/mA", "Ewe/V", "dq/mA.h",
"P/W", "<I>/mA", "(Q-Qo)/mA.h", "x"], "P/W", "<I>/mA", "(Q-Qo)/mA.h", "x"],
['mode', 'ox/red', 'error', 'control changes', 'Ns changes',
'counter inc.', 'time/s', 'control/V', 'Ewe/V', 'dq/mA.h',
'<I>/mA', '(Q-Qo)/mA.h', 'x'],
["mode", "ox/red", "error", "control changes", "Ns changes", ["mode", "ox/red", "error", "control changes", "Ns changes",
"counter inc.", "time/s", "control/V", "Ewe/V", "I/mA", "counter inc.", "time/s", "control/V", "Ewe/V", "I/mA",
"dQ/mA.h", "P/W"], "dQ/mA.h", "P/W"],

17
tests/test_BioLogic.py
View File

@@ -56,10 +56,10 @@ def test_open_MPR2():
def test_open_MPR3(): def test_open_MPR3():
mpr2 = MPRfile(os.path.join(testdata_dir, 'bio-logic3.mpr')) mpr = MPRfile(os.path.join(testdata_dir, 'bio-logic3.mpr'))
## Check the dates as a basic test that it has been read properly ## Check the dates as a basic test that it has been read properly
eq_(mpr2.startdate, date(2013, 3, 27)) eq_(mpr.startdate, date(2013, 3, 27))
eq_(mpr2.enddate, date(2013, 3, 27)) eq_(mpr.enddate, date(2013, 3, 27))
@raises(ValueError) @raises(ValueError)
@@ -86,9 +86,14 @@ def assert_MPR_matches_MPT(mpr, mpt):
mpt["time/s"], mpt["time/s"],
decimal=5) # 5 digits in CSV decimal=5) # 5 digits in CSV
assert_array_almost_equal(mpr.data["control/V/mA"], if "control/V/mA" in mpt.dtype.fields:
mpt["control/V/mA"], assert_array_almost_equal(mpr.data["control/V/mA"],
decimal=6) # 32 bit float precision mpt["control/V/mA"],
decimal=6) # 32 bit float precision
if "control/V" in mpt.dtype.fields:
assert_array_almost_equal(mpr.data["control/V"],
mpt["control/V"],
decimal=6) # 32 bit float precision
assert_array_almost_equal(mpr.data["Ewe/V"], assert_array_almost_equal(mpr.data["Ewe/V"],
mpt["Ewe/V"], mpt["Ewe/V"],