Merge pull request #908 from qiboteam/qmdrivefreqfix

Fixes late comments on #905

src/qibolab/instruments/qm/config.py

@@ -104,7 +104,7 @@ def _new_frequency_element(self, qubit, intermediate_frequency, mode="drive"):
                 f"Cannot play two different frequencies on the same {mode} line."
             )
         new_element = f"{element}_{intermediate_frequency}"
-        self.elements[new_element] = dict(self.elements[f"drive{qubit.name}"])
+        self.elements[new_element] = dict(self.elements[element])
         self.elements[new_element]["intermediate_frequency"] = intermediate_frequency
         return new_element
 
@@ -251,7 +251,7 @@ def register_element(self, qubit, pulse, time_of_flight=0, smearing=0):
             element = self.register_flux_element(qubit, pulse.frequency)
         return element
 
-    def register_pulse(self, qubit, qmpulse, element=None):
+    def register_pulse(self, qubit, qmpulse):
         """Registers pulse, waveforms and integration weights in QM config.
 
         Args:

src/qibolab/instruments/qm/controller.py

@@ -312,7 +312,7 @@ def create_sequence(self, qubits, sequence, sweepers):
                 qmpulse = QMPulse(pulse, element)
                 if pulse.type is PulseType.READOUT:
                     ro_pulses.append(qmpulse)
-                self.config.register_pulse(qubit, qmpulse, element)
+                self.config.register_pulse(qubit, qmpulse)
             qmsequence.add(qmpulse)
 
         qmsequence.shift()

tests/test_instruments_qm.py

@@ -378,6 +378,21 @@ def test_qm_register_pulses_with_different_frequencies(qmplatform):
         assert len(qmsequence.qmpulses) == 4
         elements = {qmpulse.element for qmpulse in qmsequence.qmpulses}
         assert len(elements) == 4
+        for element in elements:
+            if "readout" in element:
+                assert (
+                    controller.config.elements[element]["RF_inputs"]
+                    == controller.config.elements["readout0"]["RF_inputs"]
+                )
+                assert (
+                    controller.config.elements[element]["RF_outputs"]
+                    == controller.config.elements["readout0"]["RF_outputs"]
+                )
+            else:
+                assert (
+                    controller.config.elements[element]["RF_inputs"]
+                    == controller.config.elements["drive0"]["RF_inputs"]
+                )
     else:
         with pytest.raises(NotImplementedError):
             qmsequence, ro_pulses = controller.create_sequence(