From 859040a53cf9270ca350b2c24f6212c20e38021a Mon Sep 17 00:00:00 2001 From: Marios Samiotis Date: Tue, 30 Jan 2024 11:08:16 +0100 Subject: [PATCH] ECHO WORKS!!!! --- .../meta_instrument/LutMans/mw_lutman.py | 381 +++++++++++------ .../config_cc_s7_direct_iq.json.in | 388 ++++++++++++++++-- .../openql_experiments/single_qubit_oql.py | 3 +- 3 files changed, 610 insertions(+), 162 deletions(-) diff --git a/pycqed/instrument_drivers/meta_instrument/LutMans/mw_lutman.py b/pycqed/instrument_drivers/meta_instrument/LutMans/mw_lutman.py index f765bd650f..da9317ffb2 100644 --- a/pycqed/instrument_drivers/meta_instrument/LutMans/mw_lutman.py +++ b/pycqed/instrument_drivers/meta_instrument/LutMans/mw_lutman.py @@ -41,135 +41,260 @@ # 63 : {"name" : "phaseCorrSE" , "type" : "phase"}, # } +# default_mw_lutmap = { +# 0 : {"name" : "I" , "theta" : 0 , "phi" : 0 , "type" : "ge"}, # I for CW compatibility +# 2 : {"name" : "rY180" , "theta" : 180 , "phi" : 90 , "type" : "ge"}, # rY180 for CW compatibility +# 1 : {"name" : "rX180" , "theta" : 180 , "phi" : 0 , "type" : "ge"}, # rX180 for CW compatibility +# 3 : {"name" : "rX90" , "theta" : 90 , "phi" : 0 , "type" : "ge"}, # rX90 for CW compatibility +# 4 : {"name" : "rY90" , "theta" : 90 , "phi" : 90 , "type" : "ge"}, # rY90 for CW compatibility +# 5 : {"name" : "rX270" , "theta" : 270 , "phi" : 0 , "type" : "ge"}, # rXm90 for CW compatibility +# 6 : {"name" : "rY270" , "theta" : 270 , "phi" : 90 , "type" : "ge"}, # rYm90 for CW compatibility +# 7 : {"name" : "rX5" , "theta" : 5.625 , "phi" : 0 , "type" : "ge"}, +# 8 : {"name" : "rX11" , "theta" : 11.25 , "phi" : 0 , "type" : "ge"}, +# 9 : {"name" : "rX12" , "theta" : 180 , "phi" : 0 , "type" : "ef"}, # rX12 for CW compatibility +# 10 : {"name" : "rX16" , "theta" : 16.875 , "phi" : 0 , "type" : "ge"}, +# 11 : {"name" : "rY45" , "theta" : 45 , "phi" : 90 , "type" : "ge"}, # rY45 for CW compatibility +# 12 : {"name" : "rY315" , "theta" : -45 , "phi" : 90 , "type" : "ge"}, # rYm45 for CW compatibility +# 13 : {"name" : "rX45" , "theta" : 45 , "phi" : 0 , "type" : "ge"}, # rX45 for CW compatibility +# 14 : {"name" : "rX315" , "theta" : -45 , "phi" : 0 , "type" : "ge"}, # rXm45 for CW compatibility +# 15 : {"name" : "rX22" , "theta" : 22.5 , "phi" : 0 , "type" : "ge"}, +# 16 : {"name" : "rX28" , "theta" : 28.125 , "phi" : 0 , "type" : "ge"}, +# 17 : {"name" : "rX33" , "theta" : 33.75 , "phi" : 0 , "type" : "ge"}, +# 18 : {"name" : "rX39" , "theta" : 39.375 , "phi" : 0 , "type" : "ge"}, +# 19 : {"name" : "rX50" , "theta" : 50.625 , "phi" : 0 , "type" : "ge"}, +# 20 : {"name" : "rX56" , "theta" : 56.25 , "phi" : 0 , "type" : "ge"}, +# 21 : {"name" : "rX61" , "theta" : 61.875 , "phi" : 0 , "type" : "ge"}, +# 22 : {"name" : "rX67" , "theta" : 67.5 , "phi" : 0 , "type" : "ge"}, +# 23 : {"name" : "rX73" , "theta" : 73.125 , "phi" : 0 , "type" : "ge"}, +# 24 : {"name" : "rX78" , "theta" : 78.75 , "phi" : 0 , "type" : "ge"}, +# 25 : {"name" : "rX84" , "theta" : 84.375 , "phi" : 0 , "type" : "ge"}, +# 26 : {"name" : "rX95" , "theta" : 95.625 , "phi" : 0 , "type" : "ge"}, +# 27 : {"name" : "rX101" , "theta" : 101.25 , "phi" : 0 , "type" : "ge"}, +# 28 : {"name" : "rX106" , "theta" : 106.875 , "phi" : 0 , "type" : "ge"}, +# 29 : {"name" : "rX112" , "theta" : 112.5 , "phi" : 0 , "type" : "ge"}, +# 30 : {"name" : "rX118" , "theta" : 118.125 , "phi" : 0 , "type" : "ge"}, +# 31 : {"name" : "rX123" , "theta" : 123.75 , "phi" : 0 , "type" : "ge"}, +# 32 : {"name" : "rX129" , "theta" : 129.375 , "phi" : 0 , "type" : "ge"}, +# 33 : {"name" : "rX135" , "theta" : 135 , "phi" : 0 , "type" : "ge"}, +# 34 : {"name" : "rX140" , "theta" : 140.625 , "phi" : 0 , "type" : "ge"}, +# 35 : {"name" : "rX146" , "theta" : 146.25 , "phi" : 0 , "type" : "ge"}, +# 36 : {"name" : "rX151" , "theta" : 151.875 , "phi" : 0 , "type" : "ge"}, +# 37 : {"name" : "rX157" , "theta" : 157.5 , "phi" : 0 , "type" : "ge"}, +# 38 : {"name" : "rX163" , "theta" : 163.125 , "phi" : 0 , "type" : "ge"}, +# 39 : {"name" : "rX168" , "theta" : 168.75 , "phi" : 0 , "type" : "ge"}, +# 40 : {"name" : "rX174" , "theta" : 174.375 , "phi" : 0 , "type" : "ge"}, +# 41 : {"name" : "rX185" , "theta" : -174.375 , "phi" : 0 , "type" : "ge"}, +# 42 : {"name" : "rX191" , "theta" : -168.75 , "phi" : 0 , "type" : "ge"}, +# 43 : {"name" : "rX196" , "theta" : -163.125 , "phi" : 0 , "type" : "ge"}, +# 44 : {"name" : "rX202" , "theta" : -157.5 , "phi" : 0 , "type" : "ge"}, +# 45 : {"name" : "rX208" , "theta" : -151.875 , "phi" : 0 , "type" : "ge"}, +# 46 : {"name" : "rX213" , "theta" : -146.25 , "phi" : 0 , "type" : "ge"}, +# 47 : {"name" : "rX219" , "theta" : -140.625 , "phi" : 0 , "type" : "ge"}, +# 48 : {"name" : "rX225" , "theta" : -135 , "phi" : 0 , "type" : "ge"}, +# 49 : {"name" : "rX230" , "theta" : -129.375 , "phi" : 0 , "type" : "ge"}, +# 50 : {"name" : "rX236" , "theta" : -123.75 , "phi" : 0 , "type" : "ge"}, +# 51 : {"name" : "rX241" , "theta" : -118.125 , "phi" : 0 , "type" : "ge"}, +# 52 : {"name" : "rX247" , "theta" : -112.5 , "phi" : 0 , "type" : "ge"}, +# 53 : {"name" : "rX253" , "theta" : -106.875 , "phi" : 0 , "type" : "ge"}, +# 54 : {"name" : "rX258" , "theta" : -101.25 , "phi" : 0 , "type" : "ge"}, +# 55 : {"name" : "rX264" , "theta" : -95.625 , "phi" : 0 , "type" : "ge"}, +# 56 : {"name" : "rX275" , "theta" : -84.375 , "phi" : 0 , "type" : "ge"}, +# 57 : {"name" : "rX281" , "theta" : -78.75 , "phi" : 0 , "type" : "ge"}, +# 58 : {"name" : "rX286" , "theta" : -73.125 , "phi" : 0 , "type" : "ge"}, +# 59 : {"name" : "rX292" , "theta" : -67.5 , "phi" : 0 , "type" : "ge"}, +# 60 : {"name" : "rX298" , "theta" : -61.875 , "phi" : 0 , "type" : "ge"}, +# 61 : {"name" : "rX303" , "theta" : -56.25 , "phi" : 0 , "type" : "ge"}, +# 62 : {"name" : "rX309" , "theta" : -50.625 , "phi" : 0 , "type" : "ge"}, +# 63 : {"name" : "rX320" , "theta" : -39.375 , "phi" : 0 , "type" : "ge"}, +# 64 : {"name" : "rX326" , "theta" : -33.75 , "phi" : 0 , "type" : "ge"}, +# 65 : {"name" : "rX331" , "theta" : -28.125 , "phi" : 0 , "type" : "ge"}, +# 66 : {"name" : "rX337" , "theta" : -22.5 , "phi" : 0 , "type" : "ge"}, +# 67 : {"name" : "rX343" , "theta" : -16.875 , "phi" : 0 , "type" : "ge"}, +# 68 : {"name" : "rX348" , "theta" : -11.25 , "phi" : 0 , "type" : "ge"}, +# 69 : {"name" : "rX354" , "theta" : -5.625 , "phi" : 0 , "type" : "ge"}, +# 70 : {"name" : "rY5" , "theta" : 5.625 , "phi" : 90 , "type" : "ge"}, +# 71 : {"name" : "rY11" , "theta" : 11.25 , "phi" : 90 , "type" : "ge"}, +# 72 : {"name" : "rY16" , "theta" : 16.875 , "phi" : 90 , "type" : "ge"}, +# 73 : {"name" : "rY22" , "theta" : 22.5 , "phi" : 90 , "type" : "ge"}, +# 74 : {"name" : "rY28" , "theta" : 28.125 , "phi" : 90 , "type" : "ge"}, +# 75 : {"name" : "rY33" , "theta" : 33.75 , "phi" : 90 , "type" : "ge"}, +# 76 : {"name" : "rY39" , "theta" : 39.375 , "phi" : 90 , "type" : "ge"}, +# 77 : {"name" : "rY50" , "theta" : 50.625 , "phi" : 90 , "type" : "ge"}, +# 78 : {"name" : "rY56" , "theta" : 56.25 , "phi" : 90 , "type" : "ge"}, +# 79 : {"name" : "rY61" , "theta" : 61.875 , "phi" : 90 , "type" : "ge"}, +# 80 : {"name" : "rY67" , "theta" : 67.5 , "phi" : 90 , "type" : "ge"}, +# 81 : {"name" : "rY73" , "theta" : 73.125 , "phi" : 90 , "type" : "ge"}, +# 82 : {"name" : "rY78" , "theta" : 78.75 , "phi" : 90 , "type" : "ge"}, +# 83 : {"name" : "rY84" , "theta" : 84.375 , "phi" : 90 , "type" : "ge"}, +# 84 : {"name" : "rY95" , "theta" : 95.625 , "phi" : 90 , "type" : "ge"}, +# 85 : {"name" : "rY101" , "theta" : 101.25 , "phi" : 90 , "type" : "ge"}, +# 86 : {"name" : "rY106" , "theta" : 106.875 , "phi" : 90 , "type" : "ge"}, +# 87 : {"name" : "rY112" , "theta" : 112.5 , "phi" : 90 , "type" : "ge"}, +# 88 : {"name" : "rY118" , "theta" : 118.125 , "phi" : 90 , "type" : "ge"}, +# 89 : {"name" : "rY123" , "theta" : 123.75 , "phi" : 90 , "type" : "ge"}, +# 90 : {"name" : "rY129" , "theta" : 129.375 , "phi" : 90 , "type" : "ge"}, +# 91 : {"name" : "rY135" , "theta" : 135 , "phi" : 90 , "type" : "ge"}, +# 92 : {"name" : "rY140" , "theta" : 140.625 , "phi" : 90 , "type" : "ge"}, +# 93 : {"name" : "rY146" , "theta" : 146.25 , "phi" : 90 , "type" : "ge"}, +# 94 : {"name" : "rY151" , "theta" : 151.875 , "phi" : 90 , "type" : "ge"}, +# 95 : {"name" : "rY157" , "theta" : 157.5 , "phi" : 90 , "type" : "ge"}, +# 96 : {"name" : "rY163" , "theta" : 163.125 , "phi" : 90 , "type" : "ge"}, +# 97 : {"name" : "rY168" , "theta" : 168.75 , "phi" : 90 , "type" : "ge"}, +# 98 : {"name" : "rY174" , "theta" : 174.375 , "phi" : 90 , "type" : "ge"}, +# 99 : {"name" : "rY185" , "theta" : -174.375 , "phi" : 90 , "type" : "ge"}, +# 100: {"name" : "rY191" , "theta" : -168.75 , "phi" : 90 , "type" : "ge"}, +# 101: {"name" : "rY196" , "theta" : -163.125 , "phi" : 90 , "type" : "ge"}, +# 102: {"name" : "rY202" , "theta" : -157.5 , "phi" : 90 , "type" : "ge"}, +# 103: {"name" : "rY208" , "theta" : -151.875 , "phi" : 90 , "type" : "ge"}, +# 104: {"name" : "rY213" , "theta" : -146.25 , "phi" : 90 , "type" : "ge"}, +# 105: {"name" : "rY219" , "theta" : -140.625 , "phi" : 90 , "type" : "ge"}, +# 106: {"name" : "rY225" , "theta" : -135 , "phi" : 90 , "type" : "ge"}, +# 107: {"name" : "rY230" , "theta" : -129.375 , "phi" : 90 , "type" : "ge"}, +# 108: {"name" : "rY236" , "theta" : -123.75 , "phi" : 90 , "type" : "ge"}, +# 109: {"name" : "rY241" , "theta" : -118.125 , "phi" : 90 , "type" : "ge"}, +# 110: {"name" : "rY247" , "theta" : -112.5 , "phi" : 90 , "type" : "ge"}, +# 111: {"name" : "rY253" , "theta" : -106.875 , "phi" : 90 , "type" : "ge"}, +# 112: {"name" : "rY258" , "theta" : -101.25 , "phi" : 90 , "type" : "ge"}, +# 113: {"name" : "rY264" , "theta" : -95.625 , "phi" : 90 , "type" : "ge"}, +# 114: {"name" : "rY275" , "theta" : -84.375 , "phi" : 90 , "type" : "ge"}, +# 115: {"name" : "rY281" , "theta" : -78.75 , "phi" : 90 , "type" : "ge"}, +# 116: {"name" : "rY286" , "theta" : -73.125 , "phi" : 90 , "type" : "ge"}, +# 117: {"name" : "rY292" , "theta" : -67.5 , "phi" : 90 , "type" : "ge"}, +# 118: {"name" : "rY298" , "theta" : -61.875 , "phi" : 90 , "type" : "ge"}, +# 119: {"name" : "rY303" , "theta" : -56.25 , "phi" : 90 , "type" : "ge"}, +# 120: {"name" : "rY309" , "theta" : -50.625 , "phi" : 90 , "type" : "ge"}, +# 121: {"name" : "rY320" , "theta" : -39.375 , "phi" : 90 , "type" : "ge"}, +# 122: {"name" : "rY326" , "theta" : -33.75 , "phi" : 90 , "type" : "ge"}, +# 123: {"name" : "rY331" , "theta" : -28.125 , "phi" : 90 , "type" : "ge"}, +# 124: {"name" : "rY337" , "theta" : -22.5 , "phi" : 90 , "type" : "ge"}, +# 125: {"name" : "rY343" , "theta" : -16.875 , "phi" : 90 , "type" : "ge"}, +# 126: {"name" : "rY348" , "theta" : -11.25 , "phi" : 90 , "type" : "ge"}, +# 127: {"name" : "rY354" , "theta" : -5.625 , "phi" : 90 , "type" : "ge"} +# } + default_mw_lutmap = { - 0 : {"name" : "I" , "theta" : 0 , "phi" : 0 , "type" : "ge"}, # I for CW compatibility - 1 : {"name" : "rX180" , "theta" : 180 , "phi" : 0 , "type" : "ge"}, # rX180 for CW compatibility - 2 : {"name" : "rY180" , "theta" : 180 , "phi" : 90 , "type" : "ge"}, # rY180 for CW compatibility - 3 : {"name" : "rX90" , "theta" : 90 , "phi" : 0 , "type" : "ge"}, # rX90 for CW compatibility - 4 : {"name" : "rY90" , "theta" : 90 , "phi" : 90 , "type" : "ge"}, # rY90 for CW compatibility - 5 : {"name" : "rX270" , "theta" : 270 , "phi" : 0 , "type" : "ge"}, # rXm90 for CW compatibility - 6 : {"name" : "rY270" , "theta" : 270 , "phi" : 90 , "type" : "ge"}, # rYm90 for CW compatibility - 7 : {"name" : "rX5" , "theta" : 5.625 , "phi" : 0 , "type" : "ge"}, - 8 : {"name" : "rX11" , "theta" : 11.25 , "phi" : 0 , "type" : "ge"}, - 9 : {"name" : "rX12" , "theta" : 180 , "phi" : 0 , "type" : "ef"}, # rX12 for CW compatibility - 10 : {"name" : "rX16" , "theta" : 16.875 , "phi" : 0 , "type" : "ge"}, - 11 : {"name" : "rY45" , "theta" : 45 , "phi" : 90 , "type" : "ge"}, # rY45 for CW compatibility - 12 : {"name" : "rY315" , "theta" : -45 , "phi" : 90 , "type" : "ge"}, # rYm45 for CW compatibility - 13 : {"name" : "rX45" , "theta" : 45 , "phi" : 0 , "type" : "ge"}, # rX45 for CW compatibility - 14 : {"name" : "rX315" , "theta" : -45 , "phi" : 0 , "type" : "ge"}, # rXm45 for CW compatibility - 15 : {"name" : "rX22" , "theta" : 22.5 , "phi" : 0 , "type" : "ge"}, - 16 : {"name" : "rX28" , "theta" : 28.125 , "phi" : 0 , "type" : "ge"}, - 17 : {"name" : "rX33" , "theta" : 33.75 , "phi" : 0 , "type" : "ge"}, - 18 : {"name" : "rX39" , "theta" : 39.375 , "phi" : 0 , "type" : "ge"}, - 19 : {"name" : "rX50" , "theta" : 50.625 , "phi" : 0 , "type" : "ge"}, - 20 : {"name" : "rX56" , "theta" : 56.25 , "phi" : 0 , "type" : "ge"}, - 21 : {"name" : "rX61" , "theta" : 61.875 , "phi" : 0 , "type" : "ge"}, - 22 : {"name" : "rX67" , "theta" : 67.5 , "phi" : 0 , "type" : "ge"}, - 23 : {"name" : "rX73" , "theta" : 73.125 , "phi" : 0 , "type" : "ge"}, - 24 : {"name" : "rX78" , "theta" : 78.75 , "phi" : 0 , "type" : "ge"}, - 25 : {"name" : "rX84" , "theta" : 84.375 , "phi" : 0 , "type" : "ge"}, - 26 : {"name" : "rX95" , "theta" : 95.625 , "phi" : 0 , "type" : "ge"}, - 27 : {"name" : "rX101" , "theta" : 101.25 , "phi" : 0 , "type" : "ge"}, - 28 : {"name" : "rX106" , "theta" : 106.875 , "phi" : 0 , "type" : "ge"}, - 29 : {"name" : "rX112" , "theta" : 112.5 , "phi" : 0 , "type" : "ge"}, - 30 : {"name" : "rX118" , "theta" : 118.125 , "phi" : 0 , "type" : "ge"}, - 31 : {"name" : "rX123" , "theta" : 123.75 , "phi" : 0 , "type" : "ge"}, - 32 : {"name" : "rX129" , "theta" : 129.375 , "phi" : 0 , "type" : "ge"}, - 33 : {"name" : "rX135" , "theta" : 135 , "phi" : 0 , "type" : "ge"}, - 34 : {"name" : "rX140" , "theta" : 140.625 , "phi" : 0 , "type" : "ge"}, - 35 : {"name" : "rX146" , "theta" : 146.25 , "phi" : 0 , "type" : "ge"}, - 36 : {"name" : "rX151" , "theta" : 151.875 , "phi" : 0 , "type" : "ge"}, - 37 : {"name" : "rX157" , "theta" : 157.5 , "phi" : 0 , "type" : "ge"}, - 38 : {"name" : "rX163" , "theta" : 163.125 , "phi" : 0 , "type" : "ge"}, - 39 : {"name" : "rX168" , "theta" : 168.75 , "phi" : 0 , "type" : "ge"}, - 40 : {"name" : "rX174" , "theta" : 174.375 , "phi" : 0 , "type" : "ge"}, - 41 : {"name" : "rX185" , "theta" : -174.375 , "phi" : 0 , "type" : "ge"}, - 42 : {"name" : "rX191" , "theta" : -168.75 , "phi" : 0 , "type" : "ge"}, - 43 : {"name" : "rX196" , "theta" : -163.125 , "phi" : 0 , "type" : "ge"}, - 44 : {"name" : "rX202" , "theta" : -157.5 , "phi" : 0 , "type" : "ge"}, - 45 : {"name" : "rX208" , "theta" : -151.875 , "phi" : 0 , "type" : "ge"}, - 46 : {"name" : "rX213" , "theta" : -146.25 , "phi" : 0 , "type" : "ge"}, - 47 : {"name" : "rX219" , "theta" : -140.625 , "phi" : 0 , "type" : "ge"}, - 48 : {"name" : "rX225" , "theta" : -135 , "phi" : 0 , "type" : "ge"}, - 49 : {"name" : "rX230" , "theta" : -129.375 , "phi" : 0 , "type" : "ge"}, - 50 : {"name" : "rX236" , "theta" : -123.75 , "phi" : 0 , "type" : "ge"}, - 51 : {"name" : "rX241" , "theta" : -118.125 , "phi" : 0 , "type" : "ge"}, - 52 : {"name" : "rX247" , "theta" : -112.5 , "phi" : 0 , "type" : "ge"}, - 53 : {"name" : "rX253" , "theta" : -106.875 , "phi" : 0 , "type" : "ge"}, - 54 : {"name" : "rX258" , "theta" : -101.25 , "phi" : 0 , "type" : "ge"}, - 55 : {"name" : "rX264" , "theta" : -95.625 , "phi" : 0 , "type" : "ge"}, - 56 : {"name" : "rX275" , "theta" : -84.375 , "phi" : 0 , "type" : "ge"}, - 57 : {"name" : "rX281" , "theta" : -78.75 , "phi" : 0 , "type" : "ge"}, - 58 : {"name" : "rX286" , "theta" : -73.125 , "phi" : 0 , "type" : "ge"}, - 59 : {"name" : "rX292" , "theta" : -67.5 , "phi" : 0 , "type" : "ge"}, - 60 : {"name" : "rX298" , "theta" : -61.875 , "phi" : 0 , "type" : "ge"}, - 61 : {"name" : "rX303" , "theta" : -56.25 , "phi" : 0 , "type" : "ge"}, - 62 : {"name" : "rX309" , "theta" : -50.625 , "phi" : 0 , "type" : "ge"}, - 63 : {"name" : "rX320" , "theta" : -39.375 , "phi" : 0 , "type" : "ge"}, - 64 : {"name" : "rX326" , "theta" : -33.75 , "phi" : 0 , "type" : "ge"}, - 65 : {"name" : "rX331" , "theta" : -28.125 , "phi" : 0 , "type" : "ge"}, - 66 : {"name" : "rX337" , "theta" : -22.5 , "phi" : 0 , "type" : "ge"}, - 67 : {"name" : "rX343" , "theta" : -16.875 , "phi" : 0 , "type" : "ge"}, - 68 : {"name" : "rX348" , "theta" : -11.25 , "phi" : 0 , "type" : "ge"}, - 69 : {"name" : "rX354" , "theta" : -5.625 , "phi" : 0 , "type" : "ge"}, - 70 : {"name" : "rY5" , "theta" : 5.625 , "phi" : 90 , "type" : "ge"}, - 71 : {"name" : "rY11" , "theta" : 11.25 , "phi" : 90 , "type" : "ge"}, - 72 : {"name" : "rY16" , "theta" : 16.875 , "phi" : 90 , "type" : "ge"}, - 73 : {"name" : "rY22" , "theta" : 22.5 , "phi" : 90 , "type" : "ge"}, - 74 : {"name" : "rY28" , "theta" : 28.125 , "phi" : 90 , "type" : "ge"}, - 75 : {"name" : "rY33" , "theta" : 33.75 , "phi" : 90 , "type" : "ge"}, - 76 : {"name" : "rY39" , "theta" : 39.375 , "phi" : 90 , "type" : "ge"}, - 77 : {"name" : "rY50" , "theta" : 50.625 , "phi" : 90 , "type" : "ge"}, - 78 : {"name" : "rY56" , "theta" : 56.25 , "phi" : 90 , "type" : "ge"}, - 79 : {"name" : "rY61" , "theta" : 61.875 , "phi" : 90 , "type" : "ge"}, - 80 : {"name" : "rY67" , "theta" : 67.5 , "phi" : 90 , "type" : "ge"}, - 81 : {"name" : "rY73" , "theta" : 73.125 , "phi" : 90 , "type" : "ge"}, - 82 : {"name" : "rY78" , "theta" : 78.75 , "phi" : 90 , "type" : "ge"}, - 83 : {"name" : "rY84" , "theta" : 84.375 , "phi" : 90 , "type" : "ge"}, - 84 : {"name" : "rY95" , "theta" : 95.625 , "phi" : 90 , "type" : "ge"}, - 85 : {"name" : "rY101" , "theta" : 101.25 , "phi" : 90 , "type" : "ge"}, - 86 : {"name" : "rY106" , "theta" : 106.875 , "phi" : 90 , "type" : "ge"}, - 87 : {"name" : "rY112" , "theta" : 112.5 , "phi" : 90 , "type" : "ge"}, - 88 : {"name" : "rY118" , "theta" : 118.125 , "phi" : 90 , "type" : "ge"}, - 89 : {"name" : "rY123" , "theta" : 123.75 , "phi" : 90 , "type" : "ge"}, - 90 : {"name" : "rY129" , "theta" : 129.375 , "phi" : 90 , "type" : "ge"}, - 91 : {"name" : "rY135" , "theta" : 135 , "phi" : 90 , "type" : "ge"}, - 92 : {"name" : "rY140" , "theta" : 140.625 , "phi" : 90 , "type" : "ge"}, - 93 : {"name" : "rY146" , "theta" : 146.25 , "phi" : 90 , "type" : "ge"}, - 94 : {"name" : "rY151" , "theta" : 151.875 , "phi" : 90 , "type" : "ge"}, - 95 : {"name" : "rY157" , "theta" : 157.5 , "phi" : 90 , "type" : "ge"}, - 96 : {"name" : "rY163" , "theta" : 163.125 , "phi" : 90 , "type" : "ge"}, - 97 : {"name" : "rY168" , "theta" : 168.75 , "phi" : 90 , "type" : "ge"}, - 98 : {"name" : "rY174" , "theta" : 174.375 , "phi" : 90 , "type" : "ge"}, - 99 : {"name" : "rY185" , "theta" : -174.375 , "phi" : 90 , "type" : "ge"}, - 100: {"name" : "rY191" , "theta" : -168.75 , "phi" : 90 , "type" : "ge"}, - 101: {"name" : "rY196" , "theta" : -163.125 , "phi" : 90 , "type" : "ge"}, - 102: {"name" : "rY202" , "theta" : -157.5 , "phi" : 90 , "type" : "ge"}, - 103: {"name" : "rY208" , "theta" : -151.875 , "phi" : 90 , "type" : "ge"}, - 104: {"name" : "rY213" , "theta" : -146.25 , "phi" : 90 , "type" : "ge"}, - 105: {"name" : "rY219" , "theta" : -140.625 , "phi" : 90 , "type" : "ge"}, - 106: {"name" : "rY225" , "theta" : -135 , "phi" : 90 , "type" : "ge"}, - 107: {"name" : "rY230" , "theta" : -129.375 , "phi" : 90 , "type" : "ge"}, - 108: {"name" : "rY236" , "theta" : -123.75 , "phi" : 90 , "type" : "ge"}, - 109: {"name" : "rY241" , "theta" : -118.125 , "phi" : 90 , "type" : "ge"}, - 110: {"name" : "rY247" , "theta" : -112.5 , "phi" : 90 , "type" : "ge"}, - 111: {"name" : "rY253" , "theta" : -106.875 , "phi" : 90 , "type" : "ge"}, - 112: {"name" : "rY258" , "theta" : -101.25 , "phi" : 90 , "type" : "ge"}, - 113: {"name" : "rY264" , "theta" : -95.625 , "phi" : 90 , "type" : "ge"}, - 114: {"name" : "rY275" , "theta" : -84.375 , "phi" : 90 , "type" : "ge"}, - 115: {"name" : "rY281" , "theta" : -78.75 , "phi" : 90 , "type" : "ge"}, - 116: {"name" : "rY286" , "theta" : -73.125 , "phi" : 90 , "type" : "ge"}, - 117: {"name" : "rY292" , "theta" : -67.5 , "phi" : 90 , "type" : "ge"}, - 118: {"name" : "rY298" , "theta" : -61.875 , "phi" : 90 , "type" : "ge"}, - 119: {"name" : "rY303" , "theta" : -56.25 , "phi" : 90 , "type" : "ge"}, - 120: {"name" : "rY309" , "theta" : -50.625 , "phi" : 90 , "type" : "ge"}, - 121: {"name" : "rY320" , "theta" : -39.375 , "phi" : 90 , "type" : "ge"}, - 122: {"name" : "rY326" , "theta" : -33.75 , "phi" : 90 , "type" : "ge"}, - 123: {"name" : "rY331" , "theta" : -28.125 , "phi" : 90 , "type" : "ge"}, - 124: {"name" : "rY337" , "theta" : -22.5 , "phi" : 90 , "type" : "ge"}, - 125: {"name" : "rY343" , "theta" : -16.875 , "phi" : 90 , "type" : "ge"}, - 126: {"name" : "rY348" , "theta" : -11.25 , "phi" : 90 , "type" : "ge"}, - 127: {"name" : "rY354" , "theta" : -5.625 , "phi" : 90 , "type" : "ge"} + 0 : {"name": "i" , "theta": 0 , "phi" : 0 , "type" : "ge"}, + 1 : {"name": "rx180" , "theta": 180 , "phi" : 0, "type" : "ge"}, + 2 : {"name": "rx45" , "theta": 45 , "phi" : 0 , "type" : "ge"}, + 3 : {"name": "ry45" , "theta": 45 , "phi" : 90 , "type" : "ge"}, + 4 : {"name": "rx90" , "theta": 90 , "phi" : 0 , "type" : "ge"}, + 5 : {"name": "ry90" , "theta": 90 , "phi" : 90 , "type" : "ge"}, + 6 : {"name": "rx135" , "theta": 135 , "phi" : 0 , "type" : "ge"}, + 7 : {"name": "ry135" , "theta": 135 , "phi" : 90 , "type" : "ge"}, + 8 : {"name": "ry180" , "theta": 180 , "phi" : 90 , "type" : "ge"}, + 9 : {"name": "rx12" , "theta": 180 , "phi" : 0 , "type" : "ef"}, + 10 : {"name": "rx225" , "theta": -135 , "phi" : 0 , "type" : "ge"}, + 11 : {"name": "ry225" , "theta": -135 , "phi" : 90 , "type" : "ge"}, + 12 : {"name": "rx270" , "theta": -90 , "phi" : 0 , "type" : "ge"}, + 13 : {"name": "ry270" , "theta": -90 , "phi" : 90 , "type" : "ge"}, + 14 : {"name": "rx315" , "theta": -45 , "phi" : 0 , "type" : "ge"}, + 15 : {"name": "ry315" , "theta": -45 , "phi" : 90 , "type" : "ge"}, + 16 : {"name": "rx6" , "theta": 6.429 , "phi" : 0 , "type" : "ge"}, + 17 : {"name": "rx13" , "theta": 12.857 , "phi" : 0 , "type" : "ge"}, + 18 : {"name": "rx19" , "theta": 19.286 , "phi" : 0 , "type" : "ge"}, + 19 : {"name": "rx26" , "theta": 25.714 , "phi" : 0 , "type" : "ge"}, + 20 : {"name": "rx32" , "theta": 32.143 , "phi" : 0 , "type" : "ge"}, + 21 : {"name": "rx39" , "theta": 38.571 , "phi" : 0 , "type" : "ge"}, + 22 : {"name": "rx51" , "theta": 51.429 , "phi" : 0 , "type" : "ge"}, + 23 : {"name": "rx58" , "theta": 57.857 , "phi" : 0 , "type" : "ge"}, + 24 : {"name": "rx64" , "theta": 64.286 , "phi" : 0 , "type" : "ge"}, + 25 : {"name": "rx71" , "theta": 70.714 , "phi" : 0 , "type" : "ge"}, + 26 : {"name": "rx77" , "theta": 77.143 , "phi" : 0 , "type" : "ge"}, + 27 : {"name": "rx84" , "theta": 83.571 , "phi" : 0 , "type" : "ge"}, + 28 : {"name": "rx96" , "theta": 96.429 , "phi" : 0 , "type" : "ge"}, + 29 : {"name": "rx103" , "theta": 102.857 , "phi" : 0 , "type" : "ge"}, + 30 : {"name": "rx109" , "theta": 109.286 , "phi" : 0 , "type" : "ge"}, + 31 : {"name": "rx116" , "theta": 115.714 , "phi" : 0 , "type" : "ge"}, + 32 : {"name": "rx122" , "theta": 122.143 , "phi" : 0 , "type" : "ge"}, + 33 : {"name": "rx129" , "theta": 128.571 , "phi" : 0 , "type" : "ge"}, + 34 : {"name": "rx141" , "theta": 141.429 , "phi" : 0 , "type" : "ge"}, + 35 : {"name": "rx148" , "theta": 147.857 , "phi" : 0 , "type" : "ge"}, + 36 : {"name": "rx154" , "theta": 154.286 , "phi" : 0 , "type" : "ge"}, + 37 : {"name": "rx161" , "theta": 160.714 , "phi" : 0 , "type" : "ge"}, + 38 : {"name": "rx167" , "theta": 167.143 , "phi" : 0 , "type" : "ge"}, + 39 : {"name": "rx174" , "theta": 173.571 , "phi" : 0 , "type" : "ge"}, + 40 : {"name": "rx186" , "theta": -173.571 , "phi" : 0 , "type" : "ge"}, + 41 : {"name": "rx193" , "theta": -167.143 , "phi" : 0 , "type" : "ge"}, + 42 : {"name": "rx199" , "theta": -160.714 , "phi" : 0 , "type" : "ge"}, + 43 : {"name": "rx206" , "theta": -154.286 , "phi" : 0 , "type" : "ge"}, + 44 : {"name": "rx212" , "theta": -147.857 , "phi" : 0 , "type" : "ge"}, + 45 : {"name": "rx219" , "theta": -141.429 , "phi" : 0 , "type" : "ge"}, + 46 : {"name": "rx231" , "theta": -128.571 , "phi" : 0 , "type" : "ge"}, + 47 : {"name": "rx238" , "theta": -122.143 , "phi" : 0 , "type" : "ge"}, + 48 : {"name": "rx244" , "theta": -115.714 , "phi" : 0 , "type" : "ge"}, + 49 : {"name": "rx251" , "theta": -109.286 , "phi" : 0 , "type" : "ge"}, + 50 : {"name": "rx257" , "theta": -102.857 , "phi" : 0 , "type" : "ge"}, + 51 : {"name": "rx264" , "theta": -96.429 , "phi" : 0 , "type" : "ge"}, + 52 : {"name": "rx276" , "theta": -83.571 , "phi" : 0 , "type" : "ge"}, + 53 : {"name": "rx283" , "theta": -77.143 , "phi" : 0 , "type" : "ge"}, + 54 : {"name": "rx289" , "theta": -70.714 , "phi" : 0 , "type" : "ge"}, + 55 : {"name": "rx296" , "theta": -64.286 , "phi" : 0 , "type" : "ge"}, + 56 : {"name": "rx302" , "theta": -57.857 , "phi" : 0 , "type" : "ge"}, + 57 : {"name": "rx309" , "theta": -51.429 , "phi" : 0 , "type" : "ge"}, + 58 : {"name": "rx321" , "theta": -38.571 , "phi" : 0 , "type" : "ge"}, + 59 : {"name": "rx328" , "theta": -32.143 , "phi" : 0 , "type" : "ge"}, + 60 : {"name": "rx334" , "theta": -25.714 , "phi" : 0 , "type" : "ge"}, + 61 : {"name": "rx341" , "theta": -19.286 , "phi" : 0 , "type" : "ge"}, + 62 : {"name": "rx347" , "theta": -12.857 , "phi" : 0 , "type" : "ge"}, + 63 : {"name": "rx354" , "theta": -6.429 , "phi" : 0 , "type" : "ge"}, + 64 : {"name": "ry6" , "theta": 6.429 , "phi" : 90 , "type" : "ge"}, + 65 : {"name": "ry13" , "theta": 12.857 , "phi" : 90 , "type" : "ge"}, + 66 : {"name": "ry19" , "theta": 19.286 , "phi" : 90 , "type" : "ge"}, + 67 : {"name": "ry26" , "theta": 25.714 , "phi" : 90 , "type" : "ge"}, + 68 : {"name": "ry32" , "theta": 32.143 , "phi" : 90 , "type" : "ge"}, + 69 : {"name": "ry39" , "theta": 38.571 , "phi" : 90 , "type" : "ge"}, + 70 : {"name": "ry51" , "theta": 51.429 , "phi" : 90 , "type" : "ge"}, + 71 : {"name": "ry58" , "theta": 57.857 , "phi" : 90 , "type" : "ge"}, + 72 : {"name": "ry64" , "theta": 64.286 , "phi" : 90 , "type" : "ge"}, + 73 : {"name": "ry71" , "theta": 70.714 , "phi" : 90 , "type" : "ge"}, + 74 : {"name": "ry77" , "theta": 77.143 , "phi" : 90 , "type" : "ge"}, + 75 : {"name": "ry84" , "theta": 83.571 , "phi" : 90 , "type" : "ge"}, + 76 : {"name": "ry96" , "theta": 96.429 , "phi" : 90 , "type" : "ge"}, + 77 : {"name": "ry103" , "theta": 102.857 , "phi" : 90 , "type" : "ge"}, + 78 : {"name": "ry109" , "theta": 109.286 , "phi" : 90 , "type" : "ge"}, + 79 : {"name": "ry116" , "theta": 115.714 , "phi" : 90 , "type" : "ge"}, + 80 : {"name": "ry122" , "theta": 122.143 , "phi" : 90 , "type" : "ge"}, + 81 : {"name": "ry129" , "theta": 128.571 , "phi" : 90 , "type" : "ge"}, + 82 : {"name": "ry141" , "theta": 141.429 , "phi" : 90 , "type" : "ge"}, + 83 : {"name": "ry148" , "theta": 147.857 , "phi" : 90 , "type" : "ge"}, + 84 : {"name": "ry154" , "theta": 154.286 , "phi" : 90 , "type" : "ge"}, + 85 : {"name": "ry161" , "theta": 160.714 , "phi" : 90 , "type" : "ge"}, + 86 : {"name": "ry167" , "theta": 167.143 , "phi" : 90 , "type" : "ge"}, + 87 : {"name": "ry174" , "theta": 173.571 , "phi" : 90 , "type" : "ge"}, + 88 : {"name": "ry186" , "theta": -173.571 , "phi" : 90 , "type" : "ge"}, + 89 : {"name": "ry193" , "theta": -167.143 , "phi" : 90 , "type" : "ge"}, + 90 : {"name": "ry199" , "theta": -160.714 , "phi" : 90 , "type" : "ge"}, + 91 : {"name": "ry206" , "theta": -154.286 , "phi" : 90 , "type" : "ge"}, + 92 : {"name": "ry212" , "theta": -147.857 , "phi" : 90 , "type" : "ge"}, + 93 : {"name": "ry219" , "theta": -141.429 , "phi" : 90 , "type" : "ge"}, + 94 : {"name": "ry231" , "theta": -128.571 , "phi" : 90 , "type" : "ge"}, + 95 : {"name": "ry238" , "theta": -122.143 , "phi" : 90 , "type" : "ge"}, + 96 : {"name": "ry244" , "theta": -115.714 , "phi" : 90 , "type" : "ge"}, + 97 : {"name": "ry251" , "theta": -109.286 , "phi" : 90 , "type" : "ge"}, + 98 : {"name": "ry257" , "theta": -102.857 , "phi" : 90 , "type" : "ge"}, + 99 : {"name": "ry264" , "theta": -96.429 , "phi" : 90 , "type" : "ge"}, + 100: {"name": "ry276" , "theta": -83.571 , "phi" : 90 , "type" : "ge"}, + 101: {"name": "ry283" , "theta": -77.143 , "phi" : 90 , "type" : "ge"}, + 102: {"name": "ry289" , "theta": -70.714 , "phi" : 90 , "type" : "ge"}, + 103: {"name": "ry296" , "theta": -64.286 , "phi" : 90 , "type" : "ge"}, + 104: {"name": "ry302" , "theta": -57.857 , "phi" : 90 , "type" : "ge"}, + 105: {"name": "ry309" , "theta": -51.429 , "phi" : 90 , "type" : "ge"}, + 106: {"name": "ry321" , "theta": -38.571 , "phi" : 90 , "type" : "ge"}, + 107: {"name": "ry328" , "theta": -32.143 , "phi" : 90 , "type" : "ge"}, + 108: {"name": "ry334" , "theta": -25.714 , "phi" : 90 , "type" : "ge"}, + 109: {"name": "ry341" , "theta": -19.286 , "phi" : 90 , "type" : "ge"}, + 110: {"name": "ry347" , "theta": -12.857 , "phi" : 90 , "type" : "ge"}, + 111: {"name": "ry354" , "theta": -6.429 , "phi" : 90 , "type" : "ge"}, + 112: {"name" : "phaseCorrPark" , "type" : "phase"}, + 113: {"name" : "phaseCorrNW" , "type" : "phase"}, + 114: {"name" : "phaseCorrNE" , "type" : "phase"}, + 115: {"name" : "phaseCorrSW" , "type" : "phase"}, + 116: {"name" : "phaseCorrSE" , "type" : "phase"}, + 117: {"name" : "t" , "type" : "phase"}, + 118: {"name" : "s" , "type" : "phase"}, + 119: {"name" : "z" , "type" : "phase"}, + 120: {"name" : "sdag" , "type" : "phase"}, + 121: {"name" : "tdag" , "type" : "phase"}, } valid_types = {'ge', 'ef', 'spec', 'raw-drag', 'ef-raw', 'square', 'phase'} diff --git a/pycqed/measurement/openql_experiments/config_cc_s7_direct_iq.json.in b/pycqed/measurement/openql_experiments/config_cc_s7_direct_iq.json.in index 9333d194fb..8eee099251 100644 --- a/pycqed/measurement/openql_experiments/config_cc_s7_direct_iq.json.in +++ b/pycqed/measurement/openql_experiments/config_cc_s7_direct_iq.json.in @@ -288,7 +288,7 @@ "cc_light_instr": "y", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [2] + "static_codeword_override": [8] } }, "rx90": { @@ -298,7 +298,7 @@ "cc_light_instr": "x90", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [3] + "static_codeword_override": [4] } }, "ry90": { @@ -308,7 +308,7 @@ "cc_light_instr": "y90", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [4] + "static_codeword_override": [5] } }, "rxm90": { @@ -318,7 +318,7 @@ "cc_light_instr": "xm90", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [5] + "static_codeword_override": [4] } }, "rym90": { @@ -328,7 +328,7 @@ "cc_light_instr": "ym90", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [6] + "static_codeword_override": [5] } }, @@ -461,10 +461,12 @@ "cc_light_instr": "rx12", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [0] + "static_codeword_override": [9] } }, - // cw_00 .. cw_31 + /////////////////////////////////////////////////////// + // Ensure codewords to 64 for echo sequences generated + /////////////////////////////////////////////////////// "cw_00": { "duration": @MW_DURATION@, "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], @@ -482,7 +484,7 @@ "cc_light_instr": "cw_01", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [1] + "static_codeword_override": [9] } }, "cw_02": { @@ -552,7 +554,7 @@ "cc_light_instr": "cw_08", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [8] + "static_codeword_override": [1] } }, "cw_09": { @@ -562,7 +564,7 @@ "cc_light_instr": "cw_09", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [9] + "static_codeword_override": [8] } }, "cw_10": { @@ -572,7 +574,7 @@ "cc_light_instr": "cw_10", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [0] + "static_codeword_override": [10] } }, "cw_11": { @@ -582,7 +584,7 @@ "cc_light_instr": "cw_11", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [1] + "static_codeword_override": [11] } }, "cw_12": { @@ -592,7 +594,7 @@ "cc_light_instr": "cw_12", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [2] + "static_codeword_override": [12] } }, "cw_13": { @@ -602,7 +604,7 @@ "cc_light_instr": "cw_13", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [3] + "static_codeword_override": [13] } }, "cw_14": { @@ -612,7 +614,7 @@ "cc_light_instr": "cw_14", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [4] + "static_codeword_override": [14] } }, "cw_15": { @@ -622,7 +624,7 @@ "cc_light_instr": "cw_15", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [5] + "static_codeword_override": [15] } }, "cw_16": { @@ -632,7 +634,7 @@ "cc_light_instr": "cw_16", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [6] + "static_codeword_override": [16] } }, "cw_17": { @@ -642,7 +644,7 @@ "cc_light_instr": "cw_17", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [7] + "static_codeword_override": [17] } }, "cw_18": { @@ -652,17 +654,17 @@ "cc_light_instr": "cw_18", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [8] + "static_codeword_override": [18] } }, "cw_19": { "duration": @MW_DURATION@, "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], "type": "mw", - "cc_light_instr": "cw_109", + "cc_light_instr": "cw_19", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [9] + "static_codeword_override": [19] } }, "cw_20": { @@ -672,7 +674,7 @@ "cc_light_instr": "cw_20", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [0] + "static_codeword_override": [20] } }, "cw_21": { @@ -682,7 +684,7 @@ "cc_light_instr": "cw_21", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [1] + "static_codeword_override": [21] } }, "cw_22": { @@ -692,7 +694,7 @@ "cc_light_instr": "cw_22", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [2] + "static_codeword_override": [22] } }, "cw_23": { @@ -702,7 +704,7 @@ "cc_light_instr": "cw_23", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [3] + "static_codeword_override": [23] } }, "cw_24": { @@ -712,7 +714,7 @@ "cc_light_instr": "cw_24", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [4] + "static_codeword_override": [24] } }, "cw_25": { @@ -722,7 +724,7 @@ "cc_light_instr": "cw_25", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [5] + "static_codeword_override": [25] } }, "cw_26": { @@ -732,7 +734,7 @@ "cc_light_instr": "cw_26", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [6] + "static_codeword_override": [26] } }, "cw_27": { @@ -742,7 +744,7 @@ "cc_light_instr": "cw_27", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [7] + "static_codeword_override": [27] } }, "cw_28": { @@ -752,7 +754,7 @@ "cc_light_instr": "cw_28", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [8] + "static_codeword_override": [28] } }, "cw_29": { @@ -762,7 +764,7 @@ "cc_light_instr": "cw_29", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [9] + "static_codeword_override": [29] } }, "cw_30": { @@ -772,7 +774,7 @@ "cc_light_instr": "cw_30", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [0] + "static_codeword_override": [30] } }, "cw_31": { @@ -782,7 +784,327 @@ "cc_light_instr": "cw_31", "cc": { "ref_signal": "single-qubit-mw", - "static_codeword_override": [1] + "static_codeword_override": [31] + } + }, + "cw_32": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [32] + } + }, + "cw_33": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [33] + } + }, + "cw_34": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [34] + } + }, + "cw_35": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [35] + } + }, + "cw_36": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [36] + } + }, + "cw_37": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [37] + } + }, + "cw_38": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [38] + } + }, + "cw_39": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [39] + } + }, + "cw_40": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [40] + } + }, + "cw_41": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [41] + } + }, + "cw_42": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [42] + } + }, + "cw_43": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [43] + } + }, + "cw_44": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [44] + } + }, + "cw_45": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [45] + } + }, + "cw_46": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [46] + } + }, + "cw_47": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [47] + } + }, + "cw_48": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [48] + } + }, + "cw_49": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [49] + } + }, + "cw_50": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [50] + } + }, + "cw_51": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [51] + } + }, + "cw_52": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [52] + } + }, + "cw_53": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [53] + } + }, + "cw_54": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [54] + } + }, + "cw_55": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [55] + } + }, + "cw_56": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [56] + } + }, + "cw_57": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [57] + } + }, + "cw_58": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [58] + } + }, + "cw_59": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [59] + } + }, + "cw_60": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [60] + } + }, + "cw_61": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [61] + } + }, + "cw_62": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [62] + } + }, + "cw_63": { + "duration": @MW_DURATION@, + "matrix": [ [0.0,1.0], [1.0,0.0], [1.0,0.0], [0.0,0.0] ], + "type": "mw", + "cc_light_instr": "cw_31", + "cc": { + "ref_signal": "single-qubit-mw", + "static_codeword_override": [63] } }, diff --git a/pycqed/measurement/openql_experiments/single_qubit_oql.py b/pycqed/measurement/openql_experiments/single_qubit_oql.py index b606116fce..842b080ded 100644 --- a/pycqed/measurement/openql_experiments/single_qubit_oql.py +++ b/pycqed/measurement/openql_experiments/single_qubit_oql.py @@ -904,8 +904,9 @@ def echo(times, qubit_idx: int, platf_cfg: str, delta_phase: int = 40) -> OqlPro for i, time in enumerate(times[:-4]): + startIndex=32 # added by LDC on 2022/10/23. Starting index used to be 9. angle = (i*delta_phase) % 360 - cw_idx = angle//20 + 9 + cw_idx = 32 + angle//20 wait_nanoseconds = int(round(time*1e9 / 2)) k = p.create_kernel("echo_{}".format(i))