Commit 0fd16c67 authored by Kelvin Loh's avatar Kelvin Loh 🖖
Browse files

Merge branch 'hotfix_conditional_oscillation' into 'main' 

Hotfix conditional oscillation

See merge request !415
parents c581f41e b180f7f5

quantify_scheduler/operations/pulse_library.py

+8 −2
Original line number Diff line number Diff line
@@ -18,7 +18,13 @@ from quantify_scheduler.resources import BasebandClockResource 
class ShiftClockPhase(Operation):

    """An operation that shifts the phase of a clock by a specified amount."""



    def __init__(self, phase: float, clock: str, data: Optional[dict] = None):

    def __init__(

        self, 

        phase: float, 

        clock: str, 

        t0: float = 0,

        data: Optional[dict] = None,

        ):

        """

        Create a new instance of ShiftClockPhase.
@@ -39,7 +45,7 @@ class ShiftClockPhase(Operation): 
                "pulse_info": [

                    {

                        "wf_func": None,

                        "t0": 0,

                        "t0": t0,

                        "phase": phase,

                        "clock": clock,

                        "port": None,

quantify_scheduler/schemas/examples/transmon_test_config.json

+13 −0
Original line number Diff line number Diff line
@@ -145,6 +145,19 @@ 
                "phase_correction_control": 0,

                "phase_correction_target": 0

            }

        },

        "q2-q0": {

            "resource_map": {

                "q2": "q2:fl",

                "q0": "q0:fl"

            },

            "params": {

                "flux_duration": 3.2e-08,

                "flux_amp_control": 0.5,

                "flux_amp_target": 0,

                "phase_correction_control": 0,

                "phase_correction_target": 0

            }

        }

    }

}