From 1984c4957b183d48bde83fac77b5cb886d874780 Mon Sep 17 00:00:00 2001
From: sldesnoo-Delft <s.l.desnoo@tudelft.nl>
Date: Mon, 7 Nov 2022 13:29:21 +0100
Subject: [PATCH] Fixed RF source marker generation
---
pulse_lib/keysight/M3202A_uploader.py | 17 ++++++++---------
pulse_lib/keysight/qs_uploader.py | 17 ++++++++---------
pulse_lib/tektronix/tektronix5014_uploader.py | 17 ++++++++---------
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/pulse_lib/keysight/M3202A_uploader.py b/pulse_lib/keysight/M3202A_uploader.py
index 66246594..42773bbd 100644
--- a/pulse_lib/keysight/M3202A_uploader.py
+++ b/pulse_lib/keysight/M3202A_uploader.py
@@ -976,17 +976,16 @@ class UploadAggregator:
if rf_source is not None and rf_source.mode != 'continuous':
rf_marker_pulses.append(RfMarkerPulse(t, t_end))
- if (rf_source is not None
- and rf_source.mode == 'continuous'
- and t_end is not None):
+ if rf_source is not None:
+ if rf_source.mode == 'continuous' and t_end is not None:
rf_marker_pulses.append(RfMarkerPulse(0, t_end))
- for rf_pulse in rf_marker_pulses:
- rf_pulse.start += rf_source.delay
- rf_pulse.stop += rf_source.delay
- if rf_source.mode in ['pulsed', 'continuous']:
- rf_pulse.start -= rf_source.startup_time_ns
- rf_pulse.stop += rf_source.prolongation_ns
+ for rf_pulse in rf_marker_pulses:
+ rf_pulse.start += rf_source.delay
+ rf_pulse.stop += rf_source.delay
+ if rf_source.mode in ['pulsed', 'continuous']:
+ rf_pulse.start -= rf_source.startup_time_ns
+ rf_pulse.stop += rf_source.prolongation_ns
job.digitizer_triggers = list(trigger_channels.keys())
job.digitizer_triggers.sort()
diff --git a/pulse_lib/keysight/qs_uploader.py b/pulse_lib/keysight/qs_uploader.py
index b2ccd3e9..dcdb1bbd 100644
--- a/pulse_lib/keysight/qs_uploader.py
+++ b/pulse_lib/keysight/qs_uploader.py
@@ -1124,17 +1124,16 @@ class UploadAggregator:
if rf_source is not None and rf_source.mode != 'continuous':
rf_marker_pulses.append(RfMarkerPulse(t, t_end))
- if (rf_source is not None
- and rf_source.mode == 'continuous'
- and t_end is not None):
+ if rf_source is not None:
+ if rf_source.mode == 'continuous' and t_end is not None:
rf_marker_pulses.append(RfMarkerPulse(0, t_end))
- for rf_pulse in rf_marker_pulses:
- rf_pulse.start += rf_source.delay
- rf_pulse.stop += rf_source.delay
- if rf_source.mode in ['pulsed', 'continuous']:
- rf_pulse.start -= rf_source.startup_time_ns
- rf_pulse.stop += rf_source.prolongation_ns
+ for rf_pulse in rf_marker_pulses:
+ rf_pulse.start += rf_source.delay
+ rf_pulse.stop += rf_source.delay
+ if rf_source.mode in ['pulsed', 'continuous']:
+ rf_pulse.start -= rf_source.startup_time_ns
+ rf_pulse.stop += rf_source.prolongation_ns
sequence.close()
diff --git a/pulse_lib/tektronix/tektronix5014_uploader.py b/pulse_lib/tektronix/tektronix5014_uploader.py
index 7db930c5..7c9a2701 100644
--- a/pulse_lib/tektronix/tektronix5014_uploader.py
+++ b/pulse_lib/tektronix/tektronix5014_uploader.py
@@ -620,17 +620,16 @@ class UploadAggregator:
if rf_source is not None and rf_source.mode != 'continuous':
rf_marker_pulses.append(RfMarkerPulse(t, t_end))
- if (rf_source is not None
- and rf_source.mode == 'continuous'
- and t_end is not None):
+ if rf_source is not None:
+ if rf_source.mode == 'continuous' and t_end is not None:
rf_marker_pulses.append(RfMarkerPulse(0, t_end))
- for rf_pulse in rf_marker_pulses:
- rf_pulse.start += rf_source.delay
- rf_pulse.stop += rf_source.delay
- if rf_source.mode in ['pulsed', 'continuous']:
- rf_pulse.start -= rf_source.startup_time_ns
- rf_pulse.stop += rf_source.prolongation_ns
+ for rf_pulse in rf_marker_pulses:
+ rf_pulse.start += rf_source.delay
+ rf_pulse.stop += rf_source.delay
+ if rf_source.mode in ['pulsed', 'continuous']:
+ rf_pulse.start -= rf_source.startup_time_ns
+ rf_pulse.stop += rf_source.prolongation_ns
job.digitizer_triggers = list(triggers)
job.digitizer_triggers.sort()
--
GitLab