Adapted tests

nwittler · nwittler · commit b84dac1a79d2 · 2022-05-17T15:08:26.000Z
diff --git a/test/c2_blackbox_exp.hjson b/test/c2_blackbox_exp.hjson
@@ -10,7 +10,7 @@
         {
           no_drive:
           {
-            c3type: Envelope
+            c3type: EnvelopeDrag
             shape: no_drive
             params:
             {
@@ -63,7 +63,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -100,7 +99,7 @@
         {
           gauss:
           {
-            c3type: Envelope
+            c3type: EnvelopeDrag
             shape: gaussian_nonorm
             params:
             {
@@ -153,7 +152,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -190,7 +188,7 @@
         {
           gauss:
           {
-            c3type: Envelope
+            c3type: EnvelopeDrag
             shape: gaussian_nonorm
             params:
             {
@@ -243,7 +241,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -280,7 +277,7 @@
         {
           gauss:
           {
-            c3type: Envelope
+            c3type: EnvelopeDrag
             shape: gaussian_nonorm
             params:
             {
@@ -333,7 +330,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -370,7 +366,7 @@
         {
           gauss:
           {
-            c3type: Envelope
+            c3type: EnvelopeDrag
             shape: gaussian_nonorm
             params:
             {
@@ -423,7 +419,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -540,7 +535,6 @@
         outputs: 1
         params: {}
         resolution: 2000000000.0
-        options: drag_2
       }
       DigitalToAnalog:
       {
diff --git a/test/generator.cfg b/test/generator.cfg
@@ -9,7 +9,6 @@
           "c3type": "AWG",
           "outputs": 1,
           "resolution": 2e9,
-          "options": "drag"
       },
       "Mixer": {
           "c3type": "Mixer",
diff --git a/test/generator2.cfg b/test/generator2.cfg
@@ -9,7 +9,6 @@
           "c3type": "AWG",
           "outputs": 1,
           "resolution": 2e9,
-          "options": "drag"
       },
       "Mixer": {
           "c3type": "Mixer",
diff --git a/test/noise_exp_1.hjson b/test/noise_exp_1.hjson
@@ -101,7 +101,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -221,7 +220,6 @@
         outputs: 1
         params: {}
         resolution: 2000000000.0
-        options: ""
       }
       DigitalToAnalog:
       {
diff --git a/test/noise_exp_2.hjson b/test/noise_exp_2.hjson
@@ -101,7 +101,6 @@
                 symbol: \alpha
               }
             }
-            drag: false
           }
           carrier:
           {
@@ -221,7 +220,6 @@
         outputs: 1
         params: {}
         resolution: 2000000000.0
-        options: ""
       }
       DigitalToAnalog:
       {
diff --git a/test/one_qubit.hjson b/test/one_qubit.hjson
@@ -144,7 +144,6 @@
         inputs: 0
         outputs: 1
         resolution: 2400000000.0
-        options: "drag_2"
       }
       mixer:
       {
diff --git a/test/test_instruction.py b/test/test_instruction.py
@@ -41,7 +41,7 @@
     "delta": Quantity(value=-1, min_val=-5, max_val=3, unit=""),
 }
 
-gauss_env_single = pulse.Envelope(
+gauss_env_single = pulse.EnvelopeDrag(
     name="gauss",
     desc="Gaussian comp for single-qubit gates",
     params=gauss_params_single,
diff --git a/test/test_pwc.py b/test/test_pwc.py
@@ -51,7 +51,8 @@
 slices = int(t_final * awg_res)
 
 pwc_params = {
-    "values": Quantity(value=np.random.randn(slices), unit="V"),
+    "inphase": Quantity(value=np.random.randn(slices), unit="V"),
+    "quadrature": Quantity(value=np.random.randn(slices), unit="V"),
     "amp": Quantity(value=1.0, unit="V"),
     "xy_angle": Quantity(
         value=0.0, min_val=-0.5 * np.pi, max_val=2.5 * np.pi, unit="rad"

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`{`
`11`	`11`	`no_drive:`
`12`	`12`	`{`
`13`		`- c3type: Envelope`
	`13`	`+ c3type: EnvelopeDrag`
`14`	`14`	`shape: no_drive`
`15`	`15`	`params:`
`16`	`16`	`{`
`@@ -63,7 +63,6 @@`
`63`	`63`	`symbol: \alpha`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`- drag: false`
`67`	`66`	`}`
`68`	`67`	`carrier:`
`69`	`68`	`{`
`@@ -100,7 +99,7 @@`
`100`	`99`	`{`
`101`	`100`	`gauss:`
`102`	`101`	`{`
`103`		`- c3type: Envelope`
	`102`	`+ c3type: EnvelopeDrag`
`104`	`103`	`shape: gaussian_nonorm`
`105`	`104`	`params:`
`106`	`105`	`{`
`@@ -153,7 +152,6 @@`
`153`	`152`	`symbol: \alpha`
`154`	`153`	`}`
`155`	`154`	`}`
`156`		`- drag: false`
`157`	`155`	`}`
`158`	`156`	`carrier:`
`159`	`157`	`{`
`@@ -190,7 +188,7 @@`
`190`	`188`	`{`
`191`	`189`	`gauss:`
`192`	`190`	`{`
`193`		`- c3type: Envelope`
	`191`	`+ c3type: EnvelopeDrag`
`194`	`192`	`shape: gaussian_nonorm`
`195`	`193`	`params:`
`196`	`194`	`{`
`@@ -243,7 +241,6 @@`
`243`	`241`	`symbol: \alpha`
`244`	`242`	`}`
`245`	`243`	`}`
`246`		`- drag: false`
`247`	`244`	`}`
`248`	`245`	`carrier:`
`249`	`246`	`{`
`@@ -280,7 +277,7 @@`
`280`	`277`	`{`
`281`	`278`	`gauss:`
`282`	`279`	`{`
`283`		`- c3type: Envelope`
	`280`	`+ c3type: EnvelopeDrag`
`284`	`281`	`shape: gaussian_nonorm`
`285`	`282`	`params:`
`286`	`283`	`{`
`@@ -333,7 +330,6 @@`
`333`	`330`	`symbol: \alpha`
`334`	`331`	`}`
`335`	`332`	`}`
`336`		`- drag: false`
`337`	`333`	`}`
`338`	`334`	`carrier:`
`339`	`335`	`{`
`@@ -370,7 +366,7 @@`
`370`	`366`	`{`
`371`	`367`	`gauss:`
`372`	`368`	`{`
`373`		`- c3type: Envelope`
	`369`	`+ c3type: EnvelopeDrag`
`374`	`370`	`shape: gaussian_nonorm`
`375`	`371`	`params:`
`376`	`372`	`{`
`@@ -423,7 +419,6 @@`
`423`	`419`	`symbol: \alpha`
`424`	`420`	`}`
`425`	`421`	`}`
`426`		`- drag: false`
`427`	`422`	`}`
`428`	`423`	`carrier:`
`429`	`424`	`{`
`@@ -540,7 +535,6 @@`
`540`	`535`	`outputs: 1`
`541`	`536`	`params: {}`
`542`	`537`	`resolution: 2000000000.0`
`543`		`- options: drag_2`
`544`	`538`	`}`
`545`	`539`	`DigitalToAnalog:`
`546`	`540`	`{`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,6 @@`
`101`	`101`	`symbol: \alpha`
`102`	`102`	`}`
`103`	`103`	`}`
`104`		`- drag: false`
`105`	`104`	`}`
`106`	`105`	`carrier:`
`107`	`106`	`{`
`@@ -221,7 +220,6 @@`
`221`	`220`	`outputs: 1`
`222`	`221`	`params: {}`
`223`	`222`	`resolution: 2000000000.0`
`224`		`- options: ""`
`225`	`223`	`}`
`226`	`224`	`DigitalToAnalog:`
`227`	`225`	`{`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@`
`144`	`144`	`inputs: 0`
`145`	`145`	`outputs: 1`
`146`	`146`	`resolution: 2400000000.0`
`147`		`- options: "drag_2"`
`148`	`147`	`}`
`149`	`148`	`mixer:`
`150`	`149`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`"delta": Quantity(value=-1, min_val=-5, max_val=3, unit=""),`
`42`	`42`	`}`
`43`	`43`
`44`		`-gauss_env_single = pulse.Envelope(`
	`44`	`+gauss_env_single = pulse.EnvelopeDrag(`
`45`	`45`	`name="gauss",`
`46`	`46`	`desc="Gaussian comp for single-qubit gates",`
`47`	`47`	`params=gauss_params_single,`