From 27c1ed2d3ec7fd0f77f9d8bdcd7338882fbe0cec Mon Sep 17 00:00:00 2001
From: sldesnoo-Delft <s.l.desnoo@tudelft.nl>
Date: Tue, 27 Sep 2022 15:43:23 +0200
Subject: [PATCH] Incorrect setpoints in MeasurementParameter.add_derived_param
---
CHANGELOG.md | 5 +++++
pulse_lib/acquisition/measurement_converter.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eba36613..be96fc7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
# Changelog
All notable changes to Pulselib will be documented in this file.
+## \[1.5.5] - 2022-09-27
+
+### Fixed
+- Incorrect setpoints in measurement_param.add_derived_param.
+
## \[1.5.4] - 2022-09-23
### Added
diff --git a/pulse_lib/acquisition/measurement_converter.py b/pulse_lib/acquisition/measurement_converter.py
index c3d816f9..79693d53 100644
--- a/pulse_lib/acquisition/measurement_converter.py
+++ b/pulse_lib/acquisition/measurement_converter.py
@@ -131,7 +131,7 @@ class MeasurementParameter(MultiParameter):
time = tuple(np.arange(n_samples) * period)
setpoints.append(time, 'time', 'time', 'ns')
- self.setpoints = self.setpoints + setpoints.setpoints
+ self.setpoints = self.setpoints + (setpoints.setpoints,)
self.setpoint_names = self.setpoint_names + (setpoints.setpoint_names,)
self.setpoint_labels = self.setpoint_labels + (setpoints.setpoint_labels,)
self.setpoint_units = self.setpoint_units + (setpoints.setpoint_units,)
--
GitLab