From 7c5f704942a905e3414258d15c530bba4a8483ef Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 15 Aug 2018 12:50:30 +0200 Subject: Keysight -> KeysightCSV --- bin/mim-vs-keysight.py | 4 ++-- lib/dfatool.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/mim-vs-keysight.py b/bin/mim-vs-keysight.py index 2cfa976..d017c30 100755 --- a/bin/mim-vs-keysight.py +++ b/bin/mim-vs-keysight.py @@ -7,7 +7,7 @@ import struct import sys import tarfile import matplotlib.pyplot as plt -from dfatool import running_mean, MIMOSA, Keysight +from dfatool import running_mean, MIMOSA, KeysightCSV voltage = float(sys.argv[1]) shunt = float(sys.argv[2]) @@ -16,7 +16,7 @@ mimfile = "../data/20161114_arb_%d.mim" % shunt csvfile = "../data/20161114_%d_arb.csv" % shunt mim = MIMOSA(voltage, shunt) -ks = Keysight() +ks = KeysightCSV() charges, triggers = mim.load_data(mimfile) timestamps, currents = ks.load_data(csvfile) diff --git a/lib/dfatool.py b/lib/dfatool.py index a19ba13..6be282e 100755 --- a/lib/dfatool.py +++ b/lib/dfatool.py @@ -139,7 +139,7 @@ def regression_measures(predicted, actual): return measures -class Keysight: +class KeysightCSV: def __init__(self): pass -- cgit v1.2.3