mod

Author: AlexBourassa

glue/cirq/stimcirq/_obs_annotation.py

@@ -16,7 +16,7 @@ def __init__(
         *,
         parity_keys: Iterable[str] = (),
         relative_keys: Iterable[int] = (),
-        pauli_keys: dict[int,str] | None = None,
+        pauli_keys: Iterable[str] = (),
         observable_index: int,
     ):
         """
@@ -29,7 +29,7 @@ def __init__(
         """
         self.parity_keys = frozenset(parity_keys)
         self.relative_keys = frozenset(relative_keys)
-        self.pauli_keys = pauli_keys or {}
+        self.pauli_keys = frozenset(pauli_keys)
         self.observable_index = observable_index
 
     @property
@@ -45,6 +45,7 @@ def _value_equality_values_(self) -> Any:
     def _circuit_diagram_info_(self, args: Any) -> str:
         items: List[str] = [repr(e) for e in sorted(self.parity_keys)]
         items += [f'rec[{e}]' for e in sorted(self.relative_keys)]
+        items += sorted(self.pauli_keys)
         k = ",".join(str(e) for e in items)
         return f"Obs{self.observable_index}({k})"
 
@@ -53,7 +54,7 @@ def __repr__(self) -> str:
             f'stimcirq.CumulativeObservableAnnotation('
             f'parity_keys={sorted(self.parity_keys)}, '
             f'relative_keys={sorted(self.relative_keys)}, '
-            f'pauli_keys={self.pauli_keys}, '
+            f'pauli_keys={sorted(self.pauli_keys)}, '
             f'observable_index={self.observable_index!r})'
         )
 
@@ -65,6 +66,7 @@ def _json_dict_(self) -> Dict[str, Any]:
         result = {
             'parity_keys': sorted(self.parity_keys),
             'observable_index': self.observable_index,
+            'pauli_keys': sorted(self.pauli_keys),
         }
         if self.relative_keys:
             result['relative_keys'] = sorted(self.relative_keys)
@@ -109,8 +111,8 @@ def _stim_conversion_(
                     break
         rec_targets.extend(
             [
-                stim.target_pauli(qubit_index=k, pauli=self.pauli_keys[k]) 
-                for k in sorted(self.pauli_keys, reverse=True)
+                stim.target_pauli(qubit_index=int(k[1:]), pauli=k[0]) 
+                for k in sorted(self.pauli_keys)
             ]
         )
         if remaining:

glue/cirq/stimcirq/_stim_to_cirq.py

@@ -340,13 +340,13 @@ def coords_after_offset(
 
     def resolve_measurement_record_keys(
         self, targets: Iterable[stim.GateTarget]
-    ) -> Tuple[List[str], List[int], dict[int, str]]:
-        pauli_targets, meas_targets = {}, []
+    ) -> Tuple[List[str], List[int], List[str]]:
+        pauli_targets, meas_targets = [], []
         for t in targets:
             if t.is_measurement_record_target:
                 meas_targets.append(t)
             else:
-                pauli_targets[t.value] = t.pauli_type
+                pauli_targets.append(f'{t.pauli_type}{t.value}')
 
         if self.have_seen_loop:
             return [], [t.value for t in meas_targets], pauli_targets