mod

Author: AlexBourassa

glue/cirq/stimcirq/_obs_annotation.py

@@ -35,11 +35,11 @@ def __init__(
             if isinstance(k, str):
                 # For backward compatibility
                 _pauli_keys.append(k)
-                _qubits_to_pauli_keys.append((cirq.LineQubit(int(k[1:])), k[0]))
+                _qubits_to_pauli_keys.append((cirq.LineQubit(int(k[1:])), k))
             else:
                 qubit, basis_and_id = k
                 _pauli_keys.append(basis_and_id)
-                _qubits_to_pauli_keys.append((qubit, basis_and_id[0]))
+                _qubits_to_pauli_keys.append((qubit, basis_and_id))
         self._qubits_to_pauli_keys = tuple(_qubits_to_pauli_keys)
         self.pauli_keys = frozenset(_pauli_keys)
         self.observable_index = observable_index
@@ -147,7 +147,7 @@ def _stim_conversion_(
 
         rec_targets.extend(
             [
-                stim.target_pauli(qubit_index=tid, pauli=qubit_to_basis[q]) 
+                stim.target_pauli(qubit_index=tid, pauli=qubit_to_basis[q][0]) 
                 for q, tid in zip(self.qubits, targets)
             ]
         )

glue/cirq/stimcirq/_obs_annotation_test.py

@@ -217,10 +217,10 @@ def test_json_backwards_compat_exact():
     assert cirq.to_json(raw) == packed_v3
 
     # With pauli_keys
-    pauli_keys = [(cirq.LineQubit(0), "X"), (cirq.LineQubit(1), "Y"), (cirq.LineQubit(2), "Z")]
+    pauli_keys = [(cirq.LineQubit(0), "X0"), (cirq.LineQubit(1), "Y1"), (cirq.LineQubit(2), "Z2")]
     raw = stimcirq.CumulativeObservableAnnotation(parity_keys=['z'], relative_keys=[-2], observable_index=5, pauli_keys=pauli_keys)
     packed_v2 ='{\n  "cirq_type": "CumulativeObservableAnnotation",\n  "parity_keys": [\n    "z"\n  ],\n  "observable_index": 5,\n  "pauli_keys": [\n    "X0",\n    "Y1",\n    "Z2"\n  ],\n  "relative_keys": [\n    -2\n  ]\n}'
-    packed_v3 ='{\n  "cirq_type": "CumulativeObservableAnnotation",\n  "parity_keys": [\n    "z"\n  ],\n  "observable_index": 5,\n  "pauli_keys": [\n    [\n      {\n        "cirq_type": "LineQubit",\n        "x": 0\n      },\n      "X"\n    ],\n    [\n      {\n        "cirq_type": "LineQubit",\n        "x": 1\n      },\n      "Y"\n    ],\n    [\n      {\n        "cirq_type": "LineQubit",\n        "x": 2\n      },\n      "Z"\n    ]\n  ],\n  "relative_keys": [\n    -2\n  ]\n}'
+    packed_v3 ='{\n  "cirq_type": "CumulativeObservableAnnotation",\n  "parity_keys": [\n    "z"\n  ],\n  "observable_index": 5,\n  "pauli_keys": [\n    [\n      {\n        "cirq_type": "LineQubit",\n        "x": 0\n      },\n      "X0"\n    ],\n    [\n      {\n        "cirq_type": "LineQubit",\n        "x": 1\n      },\n      "Y1"\n    ],\n    [\n      {\n        "cirq_type": "LineQubit",\n        "x": 2\n      },\n      "Z2"\n    ]\n  ],\n  "relative_keys": [\n    -2\n  ]\n}'
 
     assert cirq.read_json(json_text=packed_v2, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER]) == raw
     assert cirq.read_json(json_text=packed_v3, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER]) == raw