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

"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

17
tests/test_BioLogic.py
View File

@@ -56,10 +56,10 @@ def test_open_MPR2():
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
eq_(mpr2.startdate, date(2013, 3, 27))
eq_(mpr2.enddate, date(2013, 3, 27))
eq_(mpr.startdate, date(2013, 3, 27))
eq_(mpr.enddate, date(2013, 3, 27))
@raises(ValueError)
@@ -86,9 +86,14 @@ def assert_MPR_matches_MPT(mpr, mpt):
mpt["time/s"],
decimal=5) # 5 digits in CSV
assert_array_almost_equal(mpr.data["control/V/mA"],
mpt["control/V/mA"],
decimal=6) # 32 bit float precision
if "control/V/mA" in mpt.dtype.fields:
assert_array_almost_equal(mpr.data["control/V/mA"],
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"],
mpt["Ewe/V"],