More renaming of gates

nwittler · nwittler · commit a689de611e03 · 2021-03-04T17:38:31.000+01:00
diff --git a/test/instructions.cfg b/test/instructions.cfg
@@ -1,5 +1,5 @@
 {
-  "RX90p":{
+  "rx90p":{
     "gate_length": 8e-9,
     "drive_channels":{
       "d1":{
@@ -47,8 +47,8 @@
       }
     }
   },
-  "RY90p":{
-    "mapto": "RX90p",
+  "ry90p":{
+    "mapto": "rx90p",
     "drive_channels":{
       "d1":{
         "gaussian": {
@@ -59,8 +59,8 @@
       }
     }
   },
-  "RX90m":{
-    "mapto": "RX90p",
+  "rx90m":{
+    "mapto": "rx90p",
     "drive_channels":{
       "d1":{
         "gaussian": {
@@ -71,8 +71,8 @@
       }
     }
   },
-  "RY90m":{
-    "mapto": "RX90p",
+  "ry90m":{
+    "mapto": "rx90p",
     "drive_channels":{
       "d1":{
         "gaussian": {
diff --git a/test/quickstart.hjson b/test/quickstart.hjson
@@ -9,18 +9,19 @@
   "single_qubit_gate_time" : 20e-9
   "single_qubit_gates":
   {
-    "RX90pQ1": {name: "rx90p", "qubits": "Q1"},
-    "RX90pQ2": {name: "rx90p", "qubits": "Q2"},
+    "rx90pQ1": {name: "rx90p", "qubits": "Q1"},
+    "rx90pQ2": {name: "rx90p", "qubits": "Q2"},
   }
   "two_qubit_gates":
   {
-    CR90:
+    cr90:
     {
+      name: "cr90"
       qubit_1: Q1
       qubit_2: Q2
       gate_time: 50e-9
     },
-    "RX90pQ1Q2":
+    "rx90pQ1Q2":
     {
       name: "rx90p"
       qubit_1: Q1
@@ -34,7 +35,7 @@
   "fid_subspace" : ["Q1", "Q2"],
   "opt_gates" :
   [
-    "CR90"
+    "cr90[0, 1]"
   ],
   "gateset_opt_map" :
   [
@@ -48,28 +49,28 @@
       ["Q1-Q2", "strength"]
     ],
     [
-      ["CR90", "d1", "gauss", "amp"]
+      ["cr90[0, 1]", "d1", "gauss", "amp"]
     ],
     [
-      ["CR90", "d1", "gauss", "freq_offset"]
+      ["cr90[0, 1]", "d1", "gauss", "freq_offset"]
     ],
     [
-      ["CR90", "d1", "gauss", "xy_angle"]
+      ["cr90[0, 1]", "d1", "gauss", "xy_angle"]
     ],
     [
-      ["CR90", "d1", "carrier", "framechange"]
+      ["cr90[0, 1]", "d1", "carrier", "framechange"]
     ],
     [
-      ["CR90", "d2", "gauss", "amp"]
+      ["cr90[0, 1]", "d2", "gauss", "amp"]
     ],
     [
-      ["CR90", "d2", "gauss", "freq_offset"]
+      ["cr90[0, 1]", "d2", "gauss", "freq_offset"]
     ],
     [
-      ["CR90", "d2", "gauss", "xy_angle"]
+      ["cr90[0, 1]", "d2", "gauss", "xy_angle"]
     ],
     [
-      ["CR90", "d2", "carrier", "framechange"]
+      ["cr90[0, 1]", "d2", "carrier", "framechange"]
     ]
   ]
 }
diff --git a/test/test_generator.py b/test/test_generator.py
@@ -79,12 +79,12 @@
     name="carrier", desc="Frequency of the local oscillator", params=carrier_parameters
 )
 
-RX90p_q1 = Instruction(name="RX90p", t_start=0.0, t_end=t_final, channels=["d1"])
-RX90p_q1.add_component(gauss_env_single, "d1")
-RX90p_q1.add_component(carr, "d1")
+rx90p_q1 = Instruction(name="rx90p", t_start=0.0, t_end=t_final, channels=["d1"])
+rx90p_q1.add_component(gauss_env_single, "d1")
+rx90p_q1.add_component(carr, "d1")
 
-tstart = RX90p_q1.t_start
-tend = RX90p_q1.t_end
+tstart = rx90p_q1.t_start
+tend = rx90p_q1.t_end
 chan = "d1"
 
 with open("test/generator_data.pickle", "rb") as filename:
@@ -93,7 +93,7 @@
 
 @pytest.mark.unit
 def test_LO() -> None:
-    lo_sig = lo.process(RX90p_q1, "d1")
+    lo_sig = lo.process(rx90p_q1, "d1")
     assert (
         lo_sig["inphase"].numpy() - data["lo_sig"]["values"][0].numpy() < 1e-12
     ).all()
@@ -105,7 +105,7 @@ def test_LO() -> None:
 
 @pytest.mark.unit
 def test_AWG() -> None:
-    awg_sig = awg.process(RX90p_q1, "d1")
+    awg_sig = awg.process(rx90p_q1, "d1")
     assert (
         awg_sig["inphase"].numpy() - data["awg_sig"]["inphase"].numpy() < 1e-12
     ).all()
@@ -116,7 +116,7 @@ def test_AWG() -> None:
 
 @pytest.mark.unit
 def test_DAC() -> None:
-    dac_sig = dac.process(RX90p_q1, "d1", data["awg_sig"])
+    dac_sig = dac.process(rx90p_q1, "d1", data["awg_sig"])
     assert (
         dac_sig["inphase"].numpy() - data["dig_to_an_sig"]["inphase"].numpy() < 1e-12
     ).all()
@@ -128,7 +128,7 @@ def test_DAC() -> None:
 
 @pytest.mark.unit
 def test_Response() -> None:
-    resp_sig = resp.process(RX90p_q1, "d1", data["dig_to_an_sig"])
+    resp_sig = resp.process(rx90p_q1, "d1", data["dig_to_an_sig"])
     assert (
         resp_sig["inphase"].numpy() - data["resp_sig"]["inphase"].numpy() < 1e-12
     ).all()
@@ -145,20 +145,20 @@ def test_mixer() -> None:
         "quadrature": data["lo_sig"]["values"][1],
         "ts": data["lo_sig"]["ts"],
     }
-    mixed_sig = mixer.process(RX90p_q1, "d1", lo_signal, data["resp_sig"])
+    mixed_sig = mixer.process(rx90p_q1, "d1", lo_signal, data["resp_sig"])
     assert (mixed_sig["values"].numpy() - data["mixer_sig"].numpy() < 1e-12).all()
 
 
 @pytest.mark.unit
 def test_v2hz() -> None:
     mixer_sig = {"values": data["mixer_sig"], "ts": data["lo_sig"]["ts"]}
-    final_sig = v_to_hz.process(RX90p_q1, "d1", mixer_sig)
+    final_sig = v_to_hz.process(rx90p_q1, "d1", mixer_sig)
     assert (final_sig["values"].numpy() - data["v2hz_sig"].numpy() < 1).all()
 
 
 @pytest.mark.integration
 def test_full_signal_chain() -> None:
-    full_signal = generator.generate_signals(RX90p_q1)
+    full_signal = generator.generate_signals(rx90p_q1)
     assert (
         full_signal["d1"]["values"].numpy()
         - data["full_signal"][0]["d1"]["values"].numpy()
diff --git a/test/test_parameter_map.py b/test/test_parameter_map.py
@@ -64,7 +64,7 @@ def setup_pmap() -> ParameterMap:
     )
 
     rx90p = Instruction(name="rx90p", t_start=0.0, t_end=t_final, channels=["d1"])
-    QId = Instruction(name="Id", t_start=0.0, t_end=t_final, channels=["d1"])
+    QId = Instruction(name="id", t_start=0.0, t_end=t_final, channels=["d1"])
 
     rx90p.add_component(gauss_env_single, "d1")
     rx90p.add_component(carr, "d1")
@@ -104,7 +104,7 @@ def setup_pmap() -> ParameterMap:
             ("rx90m[0]", "d1", "gauss", "freq_offset"),
             ("ry90m[0]", "d1", "gauss", "freq_offset"),
         ],
-        [("Id[0]", "d1", "carrier", "framechange")],
+        [("id[0]", "d1", "carrier", "framechange")],
     ]
 
     parameter_map.set_opt_map(gateset_opt_map)
diff --git a/test/test_parsers.py b/test/test_parsers.py
@@ -34,7 +34,7 @@ def test_q6_freq() -> None:
 
 @pytest.mark.unit
 def test_instructions() -> None:
-    assert list(pmap.instructions.keys()) == ["RX90p", "RY90p", "RX90m", "RY90m"]
+    assert list(pmap.instructions.keys()) == ["rx90p", "ry90p", "rx90m", "ry90m"]
 
 
 @pytest.mark.integration
@@ -84,19 +84,19 @@ def test_signal_generation() -> None:
         params=carrier_parameters,
     )
 
-    RX90p_q1 = Instruction(name="RX90p", t_start=0.0, t_end=t_final, channels=["d1"])
-    RX90p_q1.add_component(gauss_env_single, "d1")
-    RX90p_q1.add_component(carr, "d1")
+    rx90p_q1 = Instruction(name="rx90p", t_start=0.0, t_end=t_final, channels=["d1"])
+    rx90p_q1.add_component(gauss_env_single, "d1")
+    rx90p_q1.add_component(carr, "d1")
 
-    gen.generate_signals(RX90p_q1)
+    gen.generate_signals(rx90p_q1)
 
 
 @pytest.mark.unit
 def test_signal_generation_from_config() -> None:
     """
     Check that signal generation works.
     """
-    gen.generate_signals(pmap.instructions["RX90p"])
+    gen.generate_signals(pmap.instructions["rx90p"])
 
 
 @pytest.mark.integration
diff --git a/test/test_two_qubits.py b/test/test_two_qubits.py
@@ -206,10 +206,10 @@
     name="rx90p", targets=[1], t_start=0.0, t_end=t_final, channels=["d1", "d2"]
 )
 QId_q1 = gates.Instruction(
-    name="Id", targets=[0], t_start=0.0, t_end=t_final, channels=["d1", "d2"]
+    name="id", targets=[0], t_start=0.0, t_end=t_final, channels=["d1", "d2"]
 )
 QId_q2 = gates.Instruction(
-    name="Id", targets=[1], t_start=0.0, t_end=t_final, channels=["d1", "d2"]
+    name="id", targets=[1], t_start=0.0, t_end=t_final, channels=["d1", "d2"]
 )
 
 rx90p_q1.add_component(gauss_env_single, "d1")

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "RX90p":{`
	`2`	`+ "rx90p":{`
`3`	`3`	`"gate_length": 8e-9,`
`4`	`4`	`"drive_channels":{`
`5`	`5`	`"d1":{`
`@@ -47,8 +47,8 @@`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`},`
`50`		`- "RY90p":{`
`51`		`- "mapto": "RX90p",`
	`50`	`+ "ry90p":{`
	`51`	`+ "mapto": "rx90p",`
`52`	`52`	`"drive_channels":{`
`53`	`53`	`"d1":{`
`54`	`54`	`"gaussian": {`
`@@ -59,8 +59,8 @@`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`},`
`62`		`- "RX90m":{`
`63`		`- "mapto": "RX90p",`
	`62`	`+ "rx90m":{`
	`63`	`+ "mapto": "rx90p",`
`64`	`64`	`"drive_channels":{`
`65`	`65`	`"d1":{`
`66`	`66`	`"gaussian": {`
`@@ -71,8 +71,8 @@`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`},`
`74`		`- "RY90m":{`
`75`		`- "mapto": "RX90p",`
	`74`	`+ "ry90m":{`
	`75`	`+ "mapto": "rx90p",`
`76`	`76`	`"drive_channels":{`
`77`	`77`	`"d1":{`
`78`	`78`	`"gaussian": {`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,19 @@`
`9`	`9`	`"single_qubit_gate_time" : 20e-9`
`10`	`10`	`"single_qubit_gates":`
`11`	`11`	`{`
`12`		`- "RX90pQ1": {name: "rx90p", "qubits": "Q1"},`
`13`		`- "RX90pQ2": {name: "rx90p", "qubits": "Q2"},`
	`12`	`+ "rx90pQ1": {name: "rx90p", "qubits": "Q1"},`
	`13`	`+ "rx90pQ2": {name: "rx90p", "qubits": "Q2"},`
`14`	`14`	`}`
`15`	`15`	`"two_qubit_gates":`
`16`	`16`	`{`
`17`		`- CR90:`
	`17`	`+ cr90:`
`18`	`18`	`{`
	`19`	`+ name: "cr90"`
`19`	`20`	`qubit_1: Q1`
`20`	`21`	`qubit_2: Q2`
`21`	`22`	`gate_time: 50e-9`
`22`	`23`	`},`
`23`		`- "RX90pQ1Q2":`
	`24`	`+ "rx90pQ1Q2":`
`24`	`25`	`{`
`25`	`26`	`name: "rx90p"`
`26`	`27`	`qubit_1: Q1`
`@@ -34,7 +35,7 @@`
`34`	`35`	`"fid_subspace" : ["Q1", "Q2"],`
`35`	`36`	`"opt_gates" :`
`36`	`37`	`[`
`37`		`- "CR90"`
	`38`	`+ "cr90[0, 1]"`
`38`	`39`	`],`
`39`	`40`	`"gateset_opt_map" :`
`40`	`41`	`[`
`@@ -48,28 +49,28 @@`
`48`	`49`	`["Q1-Q2", "strength"]`
`49`	`50`	`],`
`50`	`51`	`[`
`51`		`- ["CR90", "d1", "gauss", "amp"]`
	`52`	`+ ["cr90[0, 1]", "d1", "gauss", "amp"]`
`52`	`53`	`],`
`53`	`54`	`[`
`54`		`- ["CR90", "d1", "gauss", "freq_offset"]`
	`55`	`+ ["cr90[0, 1]", "d1", "gauss", "freq_offset"]`
`55`	`56`	`],`
`56`	`57`	`[`
`57`		`- ["CR90", "d1", "gauss", "xy_angle"]`
	`58`	`+ ["cr90[0, 1]", "d1", "gauss", "xy_angle"]`
`58`	`59`	`],`
`59`	`60`	`[`
`60`		`- ["CR90", "d1", "carrier", "framechange"]`
	`61`	`+ ["cr90[0, 1]", "d1", "carrier", "framechange"]`
`61`	`62`	`],`
`62`	`63`	`[`
`63`		`- ["CR90", "d2", "gauss", "amp"]`
	`64`	`+ ["cr90[0, 1]", "d2", "gauss", "amp"]`
`64`	`65`	`],`
`65`	`66`	`[`
`66`		`- ["CR90", "d2", "gauss", "freq_offset"]`
	`67`	`+ ["cr90[0, 1]", "d2", "gauss", "freq_offset"]`
`67`	`68`	`],`
`68`	`69`	`[`
`69`		`- ["CR90", "d2", "gauss", "xy_angle"]`
	`70`	`+ ["cr90[0, 1]", "d2", "gauss", "xy_angle"]`
`70`	`71`	`],`
`71`	`72`	`[`
`72`		`- ["CR90", "d2", "carrier", "framechange"]`
	`73`	`+ ["cr90[0, 1]", "d2", "carrier", "framechange"]`
`73`	`74`	`]`
`74`	`75`	`]`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ def setup_pmap() -> ParameterMap:`
`64`	`64`	`)`
`65`	`65`
`66`	`66`	`rx90p = Instruction(name="rx90p", t_start=0.0, t_end=t_final, channels=["d1"])`
`67`		`- QId = Instruction(name="Id", t_start=0.0, t_end=t_final, channels=["d1"])`
	`67`	`+ QId = Instruction(name="id", t_start=0.0, t_end=t_final, channels=["d1"])`
`68`	`68`
`69`	`69`	`rx90p.add_component(gauss_env_single, "d1")`
`70`	`70`	`rx90p.add_component(carr, "d1")`
`@@ -104,7 +104,7 @@ def setup_pmap() -> ParameterMap:`
`104`	`104`	`("rx90m[0]", "d1", "gauss", "freq_offset"),`
`105`	`105`	`("ry90m[0]", "d1", "gauss", "freq_offset"),`
`106`	`106`	`],`
`107`		`- [("Id[0]", "d1", "carrier", "framechange")],`
	`107`	`+ [("id[0]", "d1", "carrier", "framechange")],`
`108`	`108`	`]`
`109`	`109`
`110`	`110`	`parameter_map.set_opt_map(gateset_opt_map)`
Original file line number	Diff line number	Diff line change
`@@ -206,10 +206,10 @@`
`206`	`206`	`name="rx90p", targets=[1], t_start=0.0, t_end=t_final, channels=["d1", "d2"]`
`207`	`207`	`)`
`208`	`208`	`QId_q1 = gates.Instruction(`
`209`		`- name="Id", targets=[0], t_start=0.0, t_end=t_final, channels=["d1", "d2"]`
	`209`	`+ name="id", targets=[0], t_start=0.0, t_end=t_final, channels=["d1", "d2"]`
`210`	`210`	`)`
`211`	`211`	`QId_q2 = gates.Instruction(`
`212`		`- name="Id", targets=[1], t_start=0.0, t_end=t_final, channels=["d1", "d2"]`
	`212`	`+ name="id", targets=[1], t_start=0.0, t_end=t_final, channels=["d1", "d2"]`
`213`	`213`	`)`
`214`	`214`
`215`	`215`	`rx90p_q1.add_component(gauss_env_single, "d1")`