Align is no longer a macro

qua-platform · Dec 12, 2024 · e7addc7 · e7addc7
1 parent 4e20b0d
commit e7addc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/quam/components/quantum_components/qubit.py b/quam/components/quantum_components/qubit.py
@@ -77,11 +77,8 @@ def get_pulse(self, pulse_name: str) -> Pulse:
         else:
             return pulses[0]
 
-    @QuantumComponent.register_macro
-    def align(self, other_qubits: Union["Qubit", Iterable["Qubit"]]):
+    def align(self, *other_qubits: "Qubit"):
         """Aligns the execution of all channels of this qubit and all other qubits"""
-        if isinstance(other_qubits, Qubit):
-            other_qubits = [other_qubits]
         channel_names = [channel.name for channel in self.channels.values()]
         for qubit in other_qubits:
             channel_names.extend([channel.name for channel in qubit.channels.values()])

diff --git a/tests/components/quantum_components/test_qubit.py b/tests/components/quantum_components/test_qubit.py
@@ -57,13 +57,13 @@ def test_qubit_get_pulse_unique(mock_qubit):
     assert mock_qubit.get_pulse("test_pulse") == pulse
 
 
-def test_qubit_align(mock_qubit_with_resonator, mocker):
+def test_qubit_align(mock_qubit_with_resonator, mock_qubit, mocker):
     mocker.patch("quam.components.quantum_components.qubit.align")
-    mock_qubit_with_resonator.align(mock_qubit_with_resonator)
+    mock_qubit_with_resonator.align(mock_qubit)
 
     from quam.components.quantum_components.qubit import align
 
-    align.assert_called_once_with("q1.xy", "q1.resonator")
+    align.assert_called_once_with("q1.xy", "q1.resonator", "q0.xy")
 
 
 def test_qubit_get_macros(mock_qubit):
@@ -73,7 +73,7 @@ def test_qubit_get_macros(mock_qubit):
 
 def test_qubit_apply_align(mock_qubit_with_resonator, mocker):
     mocker.patch("quam.components.quantum_components.qubit.align")
-    mock_qubit_with_resonator.apply("align")
+    mock_qubit_with_resonator.align()
 
     from quam.components.quantum_components.qubit import align