Skip to content
Snippets Groups Projects
Commit 6d9a630b authored by Sander de Snoo's avatar Sander de Snoo
Browse files

Added configuration of Keysight digitizer acquisition mode and hw input channel

parent 6f97ccf3
No related branches found
No related tags found
No related merge requests found
...@@ -168,8 +168,9 @@ QbloxGS1: ...@@ -168,8 +168,9 @@ QbloxGS1:
KeysightSdS: KeysightSdS:
station: keysight_test_sds.yaml station: keysight_test_sds.yaml
backend: Keysight
# station: keysight_test_sds_qs.yaml # station: keysight_test_sds_qs.yaml
backend: Keysight_QS # backend: Keysight_QS
schedule: HVI2 schedule: HVI2
# P1,P3,P6,P7 are connected to SD1-SD4 # P1,P3,P6,P7 are connected to SD1-SD4
awg_channels: awg_channels:
...@@ -186,7 +187,21 @@ KeysightSdS: ...@@ -186,7 +187,21 @@ KeysightSdS:
SD3: [Dig1,3] SD3: [Dig1,3]
SD4: [Dig1,4] SD4: [Dig1,4]
rf: rf:
# SD2:
# output: M1
# startup_time: 500
SD1:
output: [AWG1,4]
frequency: 150e6
amplitude: 200
startup_time: 200
prolongation_time: 30
hw_input_channel: 1
SD2: SD2:
output: M1 output: [AWG1,4]
startup_time: 500 frequency: 100e6
amplitude: 400
startup_time: 200
prolongation_time: 30
hw_input_channel: 1
runner: core_tools runner: core_tools
...@@ -155,11 +155,11 @@ class Context: ...@@ -155,11 +155,11 @@ class Context:
n_gates = len(gates) n_gates = len(gates)
self.virtual_matrix = np.diag([0.9]*n_gates) + 0.1 self.virtual_matrix = np.diag([0.9]*n_gates) + 0.1
pulse.add_virtual_matrix( pulse.add_virtual_matrix(
name='virtual-gates', name='virtual-gates',
real_gate_names=gates, real_gate_names=gates,
virtual_gate_names=['v'+gate for gate in gates], virtual_gate_names=['v'+gate for gate in gates],
matrix=self.virtual_matrix matrix=self.virtual_matrix
) )
for i in range(n_markers): for i in range(n_markers):
self._add_marker(f'M{i+1}') self._add_marker(f'M{i+1}')
...@@ -252,6 +252,10 @@ class Context: ...@@ -252,6 +252,10 @@ class Context:
output = params['output'] output = params['output']
if not isinstance(output, str): if not isinstance(output, str):
output = tuple(output) output = tuple(output)
channel_conf = pulse.digitizer_channels[sensor]
channel_conf.iq_out = True
dig = pulse.digitizers[channel_conf.module_name]
dig.set_channel_acquisition_mode(channel_conf.channel_number, 2)
pulse.set_digitizer_frequency(sensor, params.get('frequency', None)) pulse.set_digitizer_frequency(sensor, params.get('frequency', None))
pulse.set_digitizer_rf_source(sensor, pulse.set_digitizer_rf_source(sensor,
output=output, output=output,
...@@ -259,6 +263,7 @@ class Context: ...@@ -259,6 +263,7 @@ class Context:
mode='pulsed', mode='pulsed',
startup_time_ns=params['startup_time'], startup_time_ns=params['startup_time'],
prolongation_ns=params.get('prolongation_time', 0)) prolongation_ns=params.get('prolongation_time', 0))
pulse.set_digitizer_hw_input_channel(sensor, params.get('hw_input_channel'))
if backend == 'Tektronix_5014': if backend == 'Tektronix_5014':
# pulselib always wants a digitizer for Tektronix # pulselib always wants a digitizer for Tektronix
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment