summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2019-01-28 10:38:04 +0100
committerDaniel Friesel <derf@finalrewind.org>2019-01-28 10:38:04 +0100
commit69b60f06913dd0d86e4b84938d73840a536d9f57 (patch)
tree24b669a9989b2b5de565bffb6a2afea6ea29847c
parentf56c7317d0e5178a05d071e397745d9f60963f8a (diff)
fix mimplot
-rwxr-xr-xbin/mimplot2
-rwxr-xr-xlib/dfatool.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/mimplot b/bin/mimplot
index 1768da8..92e1b65 100755
--- a/bin/mimplot
+++ b/bin/mimplot
@@ -15,7 +15,7 @@ mimfile = sys.argv[3]
mim = MIMOSA(voltage, shunt)
-charges, triggers = mim.load_data(mimfile)
+charges, triggers = mim.load_file(mimfile)
charges = charges[:3000000]
currents = running_mean(mim.charge_to_current_nocal(charges), 10) * 1e-6
diff --git a/lib/dfatool.py b/lib/dfatool.py
index 6be282e..3cc46dc 100755
--- a/lib/dfatool.py
+++ b/lib/dfatool.py
@@ -1044,6 +1044,10 @@ class MIMOSA:
with tarfile.open(fileobj = data_object) as tf:
return self._load_tf(tf)
+ def load_file(self, filename):
+ with tarfile.open(filename) as tf:
+ return self._load_tf(tf)
+
def currents_nocal(self, charges):
ua_max = 1.836 / self.shunt * 1000000
ua_step = ua_max / 65535