From 5b9decfa25b0d763356b877c3af6fb4bdcb795c3 Mon Sep 17 00:00:00 2001 From: Jake Selig Date: Wed, 11 Dec 2024 12:54:01 -0700 Subject: [PATCH] chore: use nested parameters accessors --- pyquil/quilbase.py | 2 +- pyquil/quiltcalibrations.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyquil/quilbase.py b/pyquil/quilbase.py index 0197e50e2..663cb83bf 100644 --- a/pyquil/quilbase.py +++ b/pyquil/quilbase.py @@ -2788,7 +2788,7 @@ def _from_rs_calibration(cls, calibration: quil_rs.Calibration) -> "DefCalibrati @property # type: ignore[override] def parameters(self) -> Sequence[ParameterDesignator]: """The parameters of the calibration.""" - return _convert_to_py_expressions(super().parameters) + return _convert_to_py_expressions(super().identifier.parameters) @parameters.setter def parameters(self, parameters: Sequence[ParameterDesignator]) -> None: diff --git a/pyquil/quiltcalibrations.py b/pyquil/quiltcalibrations.py index 760cc913d..2614bb673 100644 --- a/pyquil/quiltcalibrations.py +++ b/pyquil/quiltcalibrations.py @@ -50,15 +50,15 @@ def _convert_to_calibration_match( if isinstance(instruction, quil_rs.Gate) and isinstance(calibration, quil_rs.Calibration): target_qubits = instruction.qubits target_values: Sequence[Union[quil_expr.Expression, MemoryReference]] = instruction.parameters - parameter_qubits = calibration.qubits - parameter_values: Sequence[Union[quil_expr.Expression, MemoryReference]] = calibration.parameters + parameter_qubits = calibration.identifier.qubits + parameter_values: Sequence[Union[quil_expr.Expression, MemoryReference]] = calibration.identifier.parameters py_calibration: Union[DefCalibration, DefMeasureCalibration] = DefCalibration._from_rs_calibration(calibration) elif isinstance(instruction, quil_rs.Measurement) and isinstance(calibration, quil_rs.MeasureCalibrationDefinition): target_qubits = [instruction.qubit] target_values = ( [] if not instruction.target else [MemoryReference._from_rs_memory_reference(instruction.target)] ) - calibration_qubit = calibration.qubit + calibration_qubit = calibration.identifier.qubit parameter_qubits = [] + [calibration_qubit] if calibration_qubit else [] parameter_values = [MemoryReference._from_parameter_str(calibration.identifier.parameter)] py_calibration = DefMeasureCalibration._from_rs_measure_calibration_definition(calibration)