Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pulse_lib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
QuTech QDLabs
pulse_lib
Commits
b67ecd4b
Commit
b67ecd4b
authored
7 months ago
by
Sander Snoo
Browse files
Options
Downloads
Patches
Plain Diff
Added checks on IQ marker timing.
parent
282f03ad
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pulse_lib/qblox/pulsar_uploader.py
+11
-3
11 additions, 3 deletions
pulse_lib/qblox/pulsar_uploader.py
with
11 additions
and
3 deletions
pulse_lib/qblox/pulsar_uploader.py
+
11
−
3
View file @
b67ecd4b
...
@@ -682,7 +682,7 @@ class UploadAggregator:
...
@@ -682,7 +682,7 @@ class UploadAggregator:
marker_value
=
1
<<
marker_channel
.
channel_number
marker_value
=
1
<<
marker_channel
.
channel_number
return
merge_markers
(
channel_name
,
start_stop
,
marker_value
,
min_off_ns
=
20
)
return
merge_markers
(
channel_name
,
start_stop
,
marker_value
,
min_off_ns
=
20
)
def
get_markers_seq
(
self
,
job
,
seq_name
):
def
get_markers_seq
(
self
,
job
,
seq_name
,
seq_delay
=
None
):
marker_names
=
self
.
seq_markers
.
get
(
seq_name
,
[])
marker_names
=
self
.
seq_markers
.
get
(
seq_name
,
[])
if
len
(
marker_names
)
==
0
:
if
len
(
marker_names
)
==
0
:
return
[]
return
[]
...
@@ -690,6 +690,14 @@ class UploadAggregator:
...
@@ -690,6 +690,14 @@ class UploadAggregator:
markers
=
[]
markers
=
[]
for
marker_name
in
marker_names
:
for
marker_name
in
marker_names
:
marker_channel
=
self
.
marker_channels
[
marker_name
]
marker_channel
=
self
.
marker_channels
[
marker_name
]
if
seq_delay
is
not
None
:
t_before_pulse
=
marker_channel
.
setup_ns
-
marker_channel
.
delay
+
seq_delay
t_after_pulse
=
marker_channel
.
hold_ns
+
marker_channel
.
delay
-
seq_delay
if
t_before_pulse
<=
0
:
raise
Exception
(
f
"
Marker
{
marker_name
}
on
{
seq_name
}
starts after pulse.
"
)
if
t_after_pulse
<=
0
:
raise
Exception
(
f
"
Marker
{
marker_name
}
on
{
seq_name
}
stops before end of pulse.
"
)
markers
+=
self
.
get_markers
(
job
,
marker_channel
)
markers
+=
self
.
get_markers
(
job
,
marker_channel
)
s
=
0
s
=
0
...
@@ -813,7 +821,7 @@ class UploadAggregator:
...
@@ -813,7 +821,7 @@ class UploadAggregator:
mixer_gain
=
qubit_channel
.
correction_gain
,
mixer_gain
=
qubit_channel
.
correction_gain
,
mixer_phase_offset
=
qubit_channel
.
correction_phase
)
mixer_phase_offset
=
qubit_channel
.
correction_phase
)
scaling
=
1
/
(
attenuation
*
seq
.
max_output_voltage
*
1000
)
scaling
=
1
/
(
attenuation
*
seq
.
max_output_voltage
*
1000
)
# @@@@ Multiply with sqrt(2)
seq
.
set_time_offset
(
t_offset
)
seq
.
set_time_offset
(
t_offset
)
if
self
.
feedback_triggers
:
if
self
.
feedback_triggers
:
...
@@ -821,7 +829,7 @@ class UploadAggregator:
...
@@ -821,7 +829,7 @@ class UploadAggregator:
seq
.
add_trigger_counter
(
trigger
)
seq
.
add_trigger_counter
(
trigger
)
seq
.
add_latch_events
(
job
.
latch_events
)
seq
.
add_latch_events
(
job
.
latch_events
)
markers
=
self
.
get_markers_seq
(
job
,
channel_name
)
markers
=
self
.
get_markers_seq
(
job
,
channel_name
,
delay
)
seq
.
add_markers
(
markers
)
seq
.
add_markers
(
markers
)
for
iseg
,
(
seg
,
seg_render
)
in
enumerate
(
zip
(
job
.
sequence
,
segments
)):
for
iseg
,
(
seg
,
seg_render
)
in
enumerate
(
zip
(
job
.
sequence
,
segments
)):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment