From a0920c55cfef49ae6c5fe442e85abc5c93968e08 Mon Sep 17 00:00:00 2001
From: Sander de Snoo <59472150+sldesnoo-Delft@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:41:23 +0100
Subject: [PATCH] Fix n_rep = None
---
pulse_lib/keysight/M3202A_uploader.py | 7 +++----
pulse_lib/keysight/qs_uploader.py | 3 +++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pulse_lib/keysight/M3202A_uploader.py b/pulse_lib/keysight/M3202A_uploader.py
index 028c5a9b..2a5db19e 100644
--- a/pulse_lib/keysight/M3202A_uploader.py
+++ b/pulse_lib/keysight/M3202A_uploader.py
@@ -322,8 +322,6 @@ class M3202A_Uploader:
enabled_los = []
osc_start_offset = awg_osc.delay - awg_osc.startup_time
osc_end_offset = awg_osc.delay + awg_osc.prolongation_time + t_measure
- # @@@ DEBUG CODE
- print(f"acquisitions: {job.digitizer_triggers}")
i = 0
for t, ch_names in job.digitizer_triggers.items():
merge = i > 0 and t + osc_start_offset < hvi_params[f'awg_los_off_{i}'] + 50
@@ -333,7 +331,6 @@ class M3202A_Uploader:
else:
hvi_params[f'awg_los_on_{i+1}'] = t + osc_start_offset
hvi_params[f'awg_los_off_{i+1}'] = t + osc_end_offset
- print(f"AWG LO on {t + osc_start_offset}, off: {t + osc_end_offset}")
triggered_los = []
for ch_name in ch_names:
try:
@@ -350,7 +347,6 @@ class M3202A_Uploader:
hvi_params['switch_los'] = True
hvi_params['n_switch_los'] = i
hvi_params['enabled_los'] = enabled_los
- print(f"acquisitions -> enabled_los: {enabled_los}")
if 'video_mode_channels' in hvi_params:
video_mode_los = set()
for dig_name, channels in hvi_params['video_mode_channels'].items():
@@ -490,6 +486,9 @@ class M3202A_Uploader:
result[key] = value.reshape((acq_desc.n_rep, -1))
if acq_desc.average_repetitions:
result[key] = np.mean(result[key], axis=0)
+ else:
+ for key, value in result.items():
+ result[key] = value.flatten()
return result
diff --git a/pulse_lib/keysight/qs_uploader.py b/pulse_lib/keysight/qs_uploader.py
index d37276cf..49f2d94a 100644
--- a/pulse_lib/keysight/qs_uploader.py
+++ b/pulse_lib/keysight/qs_uploader.py
@@ -572,6 +572,9 @@ class QsUploader:
result[key] = value.reshape((acq_desc.n_rep, -1))
if acq_desc.average_repetitions:
result[key] = np.mean(result[key], axis=0)
+ else:
+ for key, value in result.items():
+ result[key] = value.flatten()
return result
--
GitLab