Fixes Qiskit#7078: Make Acquire.channels only return the channel

pollyshaw · Jul 19, 2022 · 34ffb0b · 34ffb0b
1 parent 0b1a111
commit 34ffb0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/qiskit/pulse/instructions/acquire.py b/qiskit/pulse/instructions/acquire.py
@@ -88,9 +88,9 @@ def channel(self) -> AcquireChannel:
         return self.operands[1]
 
     @property
-    def channels(self) -> Tuple[Union[AcquireChannel, MemorySlot, RegisterSlot]]:
+    def channels(self) -> Tuple[AcquireChannel]:
         """Returns the channels that this schedule uses."""
-        return tuple(self.operands[ind] for ind in (1, 2, 3) if self.operands[ind] is not None)
+        return self.channel,
 
     @property
     def duration(self) -> Union[int, ParameterExpression]:

diff --git a/qiskit/scheduler/lowering.py b/qiskit/scheduler/lowering.py
@@ -22,9 +22,9 @@
 from qiskit.circuit.measure import Measure
 from qiskit.circuit.quantumcircuit import QuantumCircuit
 from qiskit.exceptions import QiskitError
-from qiskit.pulse import Schedule
+from qiskit.pulse import Schedule, Acquire
 from qiskit.pulse import instructions as pulse_inst
-from qiskit.pulse.channels import AcquireChannel, MemorySlot, DriveChannel
+from qiskit.pulse.channels import AcquireChannel, DriveChannel
 from qiskit.pulse.exceptions import PulseError
 from qiskit.pulse.macros import measure
 from qiskit.scheduler.config import ScheduleConfig
@@ -79,7 +79,9 @@ def get_measure_schedule(qubit_mem_slots: Dict[int, int]) -> CircuitPulseDef:
                     meas_q = target_qobj_transform(meas_q)
                     acquire_q = meas_q.filter(channels=[AcquireChannel(qubit)])
                     mem_slot_index = [
-                        chan.index for chan in acquire_q.channels if isinstance(chan, MemorySlot)
+                        acquire[1].mem_slot.index
+                        for acquire in acquire_q.instructions
+                        if isinstance(acquire[1], Acquire) and not (acquire[1].mem_slot is None)
                     ][0]
                     if mem_slot_index != qubit_mem_slots[qubit]:
                         raise KeyError(

diff --git a/test/python/pulse/test_schedule.py b/test/python/pulse/test_schedule.py
@@ -332,7 +332,7 @@ def test_schedule_with_acquire_on_single_qubit(self):
             )
 
         self.assertEqual(len(sched_single.instructions), 2)
-        self.assertEqual(len(sched_single.channels), 6)
+        self.assertEqual(len(sched_single.channels), 2)
 
     def test_parametric_commands_in_sched(self):
         """Test that schedules can be built with parametric commands."""