diff options
Diffstat (limited to 'pyecsca/sca/trace_set')
| -rw-r--r-- | pyecsca/sca/trace_set/chipwhisperer.py | 2 | ||||
| -rw-r--r-- | pyecsca/sca/trace_set/inspector.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pyecsca/sca/trace_set/chipwhisperer.py b/pyecsca/sca/trace_set/chipwhisperer.py index d9dcf3f..2b37c6f 100644 --- a/pyecsca/sca/trace_set/chipwhisperer.py +++ b/pyecsca/sca/trace_set/chipwhisperer.py @@ -17,7 +17,7 @@ class ChipWhispererTraceSet(TraceSet): else: data = self.__read_data(path, name) trace_data = data["traces"] - traces = [Trace(None, None, trace_samples, trace_set=self) for trace_samples in trace_data] + traces = [Trace(trace_samples, None, None, trace_set=self) for trace_samples in trace_data] del data["traces"] config = self.__read_config(path, name) super().__init__(*traces, **data, **config) diff --git a/pyecsca/sca/trace_set/inspector.py b/pyecsca/sca/trace_set/inspector.py index f9475c0..b07313d 100644 --- a/pyecsca/sca/trace_set/inspector.py +++ b/pyecsca/sca/trace_set/inspector.py @@ -197,7 +197,7 @@ class InspectorTraceSet(TraceSet): samples = np.frombuffer( file.read(dtype.itemsize * self.num_samples), dtype, self.num_samples) - result.append(Trace(title, data, samples, trace_set=self)) + result.append(Trace(samples, title, data, trace_set=self)) return result def __write(self, file): @@ -229,9 +229,8 @@ class InspectorTraceSet(TraceSet): file.write(trace.samples.tobytes()) def __scale(self, traces): - return list(map(lambda trace: Trace(trace.title, trace.data, - trace.samples.astype("f4") * self.y_scale, - trace_set=self), + return list(map(lambda trace: Trace(trace.samples.astype("f4") * self.y_scale, trace.title, + trace.data, trace_set=self), traces)) def save(self, output: Union[Path, str, BinaryIO]): |