Fix bug and add test

qiskit/scheduler/utils.py

@@ -71,7 +71,7 @@ def measure(qubits: List[int],
     """
     schedule = Schedule(name="Default measurement schedule for qubits {}".format(qubits))
     try:
-        inst_map = inst_map or backend.defaults().circuit_instruction_map
+        inst_map = inst_map or backend.defaults().instruction_schedule_map
         meas_map = meas_map or backend.configuration().meas_map
     except AttributeError:
         raise PulseError('inst_map or meas_map, and backend cannot be None simultaneously')
@@ -98,7 +98,7 @@ def measure(qubits: List[int],
                                                  mem_slots=mem_slots)
                 schedule = schedule.insert(time, new_acquire)
             # Measurement pulses should only be added if its qubit was measured by the user
-            elif inst.channels[0].index in qubits:
+            elif {channel.index for channel in inst.channels} & set(qubits):
                 schedule = schedule.insert(time, inst)
     return schedule
 

test/python/scheduler/test_utils.py

@@ -40,6 +40,9 @@ def test_measure(self):
             Acquire(duration=10)([AcquireChannel(0), AcquireChannel(1)],
                                  [MemorySlot(0), MemorySlot(1)]))
         self.assertEqual(sched.instructions, expected.instructions)
+        sched = measure(qubits=[0],
+                        backend=self.backend)
+        self.assertEqual(sched.instructions, expected.instructions)
 
     def test_fail_measure(self):
         """Test failing measure."""