diff options
| -rwxr-xr-x | bin/mimplot | 2 | ||||
| -rwxr-xr-x | lib/dfatool.py | 4 |
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 |