Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
5cf2e35
minor corrections in doc strings
virginia-m Apr 18, 2019
e1a15a1
add get_plot_formatted_data method and helper methods
virginia-m Apr 18, 2019
66f259e
add tests for get_plot_formatted_arrays and helper methods
virginia-m Apr 18, 2019
4535e39
add predefined driven control types
virginia-m Apr 18, 2019
5d8bd2e
add predefined driven controls
virginia-m Apr 18, 2019
94b71d6
add shape and scheme parameter to driven controls
virginia-m Apr 18, 2019
14103c8
fix linting errors
virginia-m Apr 18, 2019
05f40a1
add missing parameter documentation
virginia-m Apr 18, 2019
2052dce
add conversion functions for Gaussian segments
virginia-m Apr 18, 2019
f150ec4
enable Gaussian segments for driven controls
virginia-m Apr 18, 2019
45ea952
add predefined driven controls to init
virginia-m Apr 18, 2019
183bd85
start writing tests for predefined driven control
virginia-m Apr 18, 2019
7a8f07f
fix inter-package imports
virginia-m Apr 19, 2019
fed2098
set default shape parameter
virginia-m Apr 19, 2019
e9241a4
add test for BB1
virginia-m Apr 19, 2019
63e4318
fix typo
virginia-m Apr 19, 2019
e2f52e7
add import for new_predefined_driven_control
virginia-m Apr 19, 2019
f36935a
clean up imports
virginia-m Apr 19, 2019
4a6e555
import new_predefined_driven_control
virginia-m Apr 19, 2019
7c9be7b
add example notebook for driven controls
virginia-m Apr 19, 2019
aba3387
add reference to Q-CTRL docs
virginia-m Apr 19, 2019
2df5256
add pretty __str__ representation for DrivenControls
virginia-m Apr 19, 2019
bd94077
update keyword argument 'scheme'
virginia-m Apr 19, 2019
962e691
add check to test_primitive_control
virginia-m Apr 19, 2019
3e9d2a0
add tests for SK1 and SCROFULOUS
virginia-m Apr 19, 2019
f77478f
add remaining test cases for all predefined driven controls
virginia-m Apr 20, 2019
1b00aa1
change plot colours
virginia-m Apr 23, 2019
0e78d4b
remove Gaussian pulse shapes
virginia-m May 6, 2019
d27c9c4
change driven control naming conventions
virginia-m May 6, 2019
9958bf8
Merge branch 'master' into add_driven_controls
virginia-m May 6, 2019
8f775d5
change keywords of plot data dictionary
virginia-m May 6, 2019
96d8402
change keyword arg dimensionless -> dimensionless_rabi_rate
virginia-m May 6, 2019
d75d463
driven control constructor changed
May 9, 2019
43cf7d2
tests reverted
May 9, 2019
5dfaae9
explicit conversion of inputs to numpy array
May 9, 2019
9dafdce
attributes are removed or changed to property
May 9, 2019
8ac877a
maximum detuning rate changed to maximum_detuning
May 9, 2019
97b6f21
segements removed from error messages
May 9, 2019
1c1b9b8
partial linting
May 9, 2019
2d0d8ac
fix export and plot methods for new attributes
virginia-m May 9, 2019
438aeac
modify DrivenControl constructor args and adapt tests
virginia-m May 9, 2019
a9c4b2d
resolve merge conflict in export methods
virginia-m May 9, 2019
dad4973
adapting dimensions for segments and fixing tests
virginia-m May 9, 2019
2e09cab
dynamical_decoupling_sequence tests fixed
May 9, 2019
8b37858
Updated notebooks
michaelhush May 9, 2019
9ddabd9
Update the example notebooks
michaelhush May 9, 2019
dbba333
Removed unneccesary standard segment convertion.
michaelhush May 9, 2019
1482016
driven control pretty string fixed
May 9, 2019
d3fc1cf
Merge branch 'add_driven_controls' of github.com:qctrl/python-open-co…
May 9, 2019
596d2bc
added more validation tests for driven control inputs
May 9, 2019
748b188
consolidating rabi rate definitions, fixing tests
virginia-m May 9, 2019
821977a
merge parallel commits
virginia-m May 9, 2019
98d85b9
fix minor linting issue in pretty print
virginia-m May 9, 2019
cd296f1
Merge branch 'add_driven_controls' of github.com:qctrl/python-open-co…
May 9, 2019
ce26d99
linted and tested
May 9, 2019
0863804
Updated jupyter notebook
michaelhush May 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 19 additions & 28 deletions examples/creating_a_dds.ipynb

Large diffs are not rendered by default.

427 changes: 427 additions & 0 deletions examples/creating_a_driven_control.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion qctrlopencontrols/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
from .dynamic_decoupling_sequences import (DynamicDecouplingSequence,
new_predefined_dds,
convert_dds_to_driven_controls)
from .driven_controls import DrivenControls
from .driven_controls import DrivenControl, new_predefined_driven_control
from .qiskit import convert_dds_to_quantum_circuit
23 changes: 20 additions & 3 deletions qctrlopencontrols/driven_controls/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,29 @@

"""
=============
Pulses module
driven_controls module
=============
"""

from .driven_controls import DrivenControls
from .driven_control import DrivenControl

from .constants import (
UPPER_BOUND_RABI_RATE, UPPER_BOUND_DETUNING_RATE,
UPPER_BOUND_DURATION, LOWER_BOUND_DURATION, UPPER_BOUND_SEGMENTS)
UPPER_BOUND_DURATION, LOWER_BOUND_DURATION, UPPER_BOUND_SEGMENTS,
PRIMITIVE, BB1, SK1,
WAMF1,
CORPSE,
CORPSE_IN_SK1,
CORPSE_IN_BB1,
SCROFULOUS,
CORPSE_IN_SCROFULOUS)

from .predefined import (
new_predefined_driven_control,
new_primitive_control, new_wimperis_1_control, new_solovay_kitaev_1_control,
new_compensating_for_off_resonance_with_a_pulse_sequence_control,
new_compensating_for_off_resonance_with_a_pulse_sequence_with_solovay_kitaev_control,
new_compensating_for_off_resonance_with_a_pulse_sequence_with_wimperis_control,
new_short_composite_rotation_for_undoing_length_over_and_under_shoot_control,
new_walsh_amplitude_modulated_filter_1_control,
new_corpse_in_scrofulous_control)
40 changes: 39 additions & 1 deletion qctrlopencontrols/driven_controls/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

"""
================
pulses.constants
driven_controls.constants
================
"""

Expand All @@ -38,3 +38,41 @@
UPPER_BOUND_SEGMENTS = 10000
"""Maximum number of segments allowed in a control
"""

#Driven control types
PRIMITIVE = 'primitive'
"""Primitive control
"""

BB1 = 'BB1'
"""First-order Wimperis control, also known as BB1
"""

SK1 = 'SK1'
"""First-order Solovay-Kitaev control
"""

WAMF1 = 'WAMF1'
"""First-order Walsh sequence control
"""

CORPSE = 'CORPSE'
"""Dynamically corrected control - Compensating for Off-Resonance with a Pulse Sequence (COPRSE)
"""

CORPSE_IN_BB1 = 'CORPSE in BB1'
"""Concatenated dynamically corrected control - BB1 inside COPRSE
"""

CORPSE_IN_SK1 = 'CORPSE in SK1'
"""Concatenated dynamically corrected control - First order Solovay-Kitaev inside COPRSE
"""

SCROFULOUS = 'SCROFULOUS'
"""Dynamically corrected control -
Short Composite Rotation For Undoing Length Over and Under Shoot (SCROFULOUS)
"""

CORPSE_IN_SCROFULOUS = 'CORPSE in SCROFULOUS'
"""Concatenated dynamically corrected control - CORPSE inside SCROFULOUS
"""
Loading