in qblox: mixer_corr_gain and moxer_corr_phase per sequencer instead of per port

Author: RoyStegeman

src/qibolab/_core/instruments/qblox/config/module.py

@@ -6,12 +6,13 @@
 
 from qibolab._core.components import Channel, OscillatorConfig
 from qibolab._core.components.channels import AcquisitionChannel
-from qibolab._core.components.configs import Configs, DcConfig, IqMixerConfig
+from qibolab._core.components.configs import Configs, DcConfig
 from qibolab._core.components.filters import (
     ExponentialFilter,
     FiniteImpulseResponseFilter,
 )
 from qibolab._core.identifier import ChannelId
+from qibolab._core.instruments.qblox.config.sequencer import QbloxIqMixerConfig
 from qibolab._core.serialize import Model
 
 from .port import PortAddress
@@ -68,10 +69,10 @@ def mixers(
     all: dict[ChannelId, str],
     configs: Configs,
     module_channels: set[ChannelId],
-) -> dict[ChannelId, IqMixerConfig]:
+) -> dict[ChannelId, QbloxIqMixerConfig]:
     # TODO: identical to the `.los()` function, deduplicate it please...
     return {
-        id_: cast(IqMixerConfig, configs[mixer])
+        id_: cast(QbloxIqMixerConfig, configs[mixer])
         for id_, mixer in all.items()
         if id_ in module_channels
     }
@@ -121,7 +122,7 @@ def build(
         channels: dict[ChannelId, Channel],
         configs: Configs,
         los: dict[ChannelId, OscillatorConfig],
-        mixers: dict[ChannelId, IqMixerConfig],
+        mixers: dict[ChannelId, QbloxIqMixerConfig],
         qrm: bool,
     ) -> "ModuleConfig":
         ports = {}

src/qibolab/_core/instruments/qblox/config/sequencer.py

@@ -1,5 +1,5 @@
 import json
-from typing import Optional, cast
+from typing import Literal, Optional, cast
 
 import numpy as np
 from pydantic import ConfigDict
@@ -24,6 +24,24 @@
 __all__ = []
 
 
+class QbloxIqMixerConfig(IqMixerConfig):
+    kind: Literal["qblox-iq-mixer"] = "qblox-iq-mixer"
+
+    """qblox has 6 sequencers per module."""
+    scale_q_sequencer0: float = 1.0
+    phase_q_sequencer0: float = 0.0
+    scale_q_sequencer1: float = 1.0
+    phase_q_sequencer1: float = 0.0
+    scale_q_sequencer2: float = 1.0
+    phase_q_sequencer2: float = 0.0
+    scale_q_sequencer3: float = 1.0
+    phase_q_sequencer3: float = 0.0
+    scale_q_sequencer4: float = 1.0
+    phase_q_sequencer4: float = 0.0
+    scale_q_sequencer5: float = 1.0
+    phase_q_sequencer5: float = 0.0
+
+
 def _integration_length(sequence: Q1Sequence) -> Optional[int]:
     """Find integration length based on sequence waveform lengths."""
     lengths = {
@@ -129,9 +147,11 @@ def build(
             lo_freq = cast(OscillatorConfig, configs[probe_.lo]).frequency
             cfg.nco_freq = int(freq - lo_freq)
             assert probe_.mixer is not None
-            mixer = cast(IqMixerConfig, configs[probe_.mixer])
-            cfg.mixer_corr_gain_ratio = mixer.scale_q
-            cfg.mixer_corr_phase_offset_degree = mixer.phase_q
+            mixer = cast(QbloxIqMixerConfig, configs[probe_.mixer])
+            cfg.mixer_corr_gain_ratio = getattr(mixer, f"scale_q_sequencer{index}")
+            cfg.mixer_corr_phase_offset_degree = getattr(
+                mixer, f"phase_q_sequencer{index}"
+            )
 
         return cfg