Merge branch 'master' into dev

CHANGELOG.md

@@ -12,6 +12,10 @@ All notable changes to Pulselib will be documented in this file.
 - Added aggregate_func to aggregate n samples of 1 measurement to a single value with a user defined function.
 - Improved accuracy of hres ramps for Keysight (error is now ~10 ps).
 
+## \[1.6.33] - 2023-08-17
+
+- Fixed IQ output of qblox_fast_scan
+
 ## \[1.6.32] - 2023-08-10
 
 - Removed add_HVI_marker and add_HVI_variable from segment channels.

pulse_lib/__init__.py

 
-__version__ = "1.6.32"
+__version__ = "1.6.33"

pulse_lib/fast_scan/qblox_fast_scans.py

@@ -310,7 +310,7 @@ def _get_channels(pulse_lib, channel_map, channels, iq_mode, iq_complex):
         channel_map = {}
         for name in acq_channels:
             dig_ch = dig_channels[name]
-            if dig_ch.iq_out and not iq_mode != 'Complex':
+            if dig_ch.iq_out and iq_mode != 'Complex':
                 ch_funcs = iq_mode2func(iq_mode)
                 if isinstance(ch_funcs, list):
                     for postfix,func in ch_funcs:

setup.py

@@ -6,7 +6,7 @@ print('packages: %s' % packages)
 
 
 setup(name="pulse_lib",
-	version="1.6.32",
+	version="1.6.33",
 	packages = find_packages(),
     python_requires=">=3.7",
     install_requires=[

tbump.toml

@@ -2,7 +2,7 @@
 # github_url = "https://github.com/<user or organization>/<project>/"
 
 [version]
-current = "1.6.32"
+current = "1.6.33"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before