summaryrefslogtreecommitdiff
path: root/lib/loader/__init__.py
diff options
context:
space:
mode:
authorBirte Kristina Friesel <birte.friesel@uos.de>2024-03-11 14:08:21 +0100
committerBirte Kristina Friesel <birte.friesel@uos.de>2024-03-11 14:08:21 +0100
commit1e29075c9f625947a82c86d7304ed20eb6f06e64 (patch)
tree789b3fe8b253c0069b97d5c47e625513ee37a32c /lib/loader/__init__.py
parent3a6089bc4258e884b5ce909538b2f49a3dc87e78 (diff)
Move Logfile and CSVfile from utils to a new loader class
Diffstat (limited to 'lib/loader/__init__.py')
-rw-r--r--lib/loader/__init__.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/loader/__init__.py b/lib/loader/__init__.py
index caa2212..9dc83e3 100644
--- a/lib/loader/__init__.py
+++ b/lib/loader/__init__.py
@@ -20,6 +20,7 @@ from .energytrace import (
EnergyTraceWithTimer,
)
from .keysight import DLog, KeysightCSV
+from .plain import Logfile, CSVfile
from .mimosa import MIMOSA
logger = logging.getLogger(__name__)
@@ -667,9 +668,9 @@ class RawData:
"offline_aggregates", None
)
if offline_aggregates:
- state_or_transition[
- "online_aggregates"
- ] = offline_aggregates
+ state_or_transition["online_aggregates"] = (
+ offline_aggregates
+ )
for j, traces in enumerate(ptalog["traces"]):
self.filenames.append("{}#{}".format(filename, j))
@@ -736,9 +737,9 @@ class RawData:
"offline_aggregates", None
)
if offline_aggregates:
- state_or_transition[
- "online_aggregates"
- ] = offline_aggregates
+ state_or_transition["online_aggregates"] = (
+ offline_aggregates
+ )
for j, traces in enumerate(ptalog["traces"]):
self.filenames.append("{}#{}".format(filename, j))
self.traces_by_fileno.append(traces)