From 85374727ad66b884b25ddd659600ee9317db071b Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 3 Dec 2020 15:16:24 +0100 Subject: use common energytrace loader code this also fixes a nasty off-by-one in the barcode loader (now _load_energytrace): wrong: interval_start_timestamp = data[:-1, 0] * 1e-6 correct: interval_start_timestamp = data[1:, 0] * 1e-6 --- lib/lennart/EnergyInterface.py | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'lib/lennart/EnergyInterface.py') diff --git a/lib/lennart/EnergyInterface.py b/lib/lennart/EnergyInterface.py index 19aae84..55bf7c1 100644 --- a/lib/lennart/EnergyInterface.py +++ b/lib/lennart/EnergyInterface.py @@ -70,39 +70,6 @@ class EnergyInterface(DataInterface): return self.energytrace.wait() - def getData(self): - """ - cleans the string data and creates int list - :return: list of data, in format [[int,int,int,int], [int,int,int,int], ... ] - """ - energytrace_log = open(self.temp_file) - lines = energytrace_log.readlines()[21:] - data = [] - for line in lines: - if "MSP430_DisableEnergyTrace" in line: - break - else: - data.append([int(i) for i in line.split()]) - return data - - @classmethod - def getDataFromString(cls, string, delimiter="\\n"): - """ - Parsing the data from string - - :param string: input string which will be parsed - :param delimiter: for normal file its \n - :return: list of data, in format [[int,int,int,int], [int,int,int,int], ... ] - """ - lines = string.split(delimiter)[21:] - data = [] - for line in lines: - if "MSP430_DisableEnergyTrace" in line: - break - else: - data.append([int(i) for i in line.split()]) - return data - def setFile(self, path): """ changeing the temporary file -- cgit v1.2.3