From 03a8806f0576d0799202406ef57b01fb4d06bfd9 Mon Sep 17 00:00:00 2001
From: Alessandro Candido <candido.ale@gmail.com>
Date: Thu, 5 Dec 2024 18:34:02 +0100
Subject: [PATCH] fix: Move attenuation to lo configs, drop dedicated channel
 config

---
 iqm5q/parameters.json | 96 ++++++++++++++++++++-----------------------
 iqm5q/platform.py     |  6 +--
 2 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/iqm5q/parameters.json b/iqm5q/parameters.json
index 089bfc1e..44cf8a6a 100644
--- a/iqm5q/parameters.json
+++ b/iqm5q/parameters.json
@@ -16,79 +16,64 @@
             "kind": "oscillator"
         },
         "0/drive": {
-            "kind": "qblox-iq",
-            "frequency": 4107103000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 4107103000
         },
         "0/drive12": {
-            "kind": "qblox-iq",
-            "frequency": 3995623000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 3995623000
         },
         "0/probe": {
-            "kind": "qblox-iq",
-            "frequency": 5232350000,
-            "attenuation": 28
+            "kind": "iq",
+            "frequency": 5232350000
         },
         "1/drive": {
-            "kind": "qblox-iq",
-            "frequency": 4257487324,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 4257487324
         },
         "1/drive12": {
-            "kind": "qblox-iq",
-            "frequency": 41521410000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 41521410000
         },
         "1/probe": {
-            "kind": "qblox-iq",
-            "frequency": 4934492000,
-            "attenuation": 28
+            "kind": "iq",
+            "frequency": 4934492000
         },
         "2/drive": {
-            "kind": "qblox-iq",
-            "frequency": 4538373000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 4538373000
         },
         "2/drive12": {
-            "kind": "qblox-iq",
-            "frequency": 4337630000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 4337630000
         },
         "2/probe": {
-            "kind": "qblox-iq",
-            "frequency": 6106000000,
-            "attenuation": 28
+            "kind": "iq",
+            "frequency": 6106000000
         },
         "3/drive": {
-            "kind": "qblox-iq",
-            "frequency": 4160866475,
-            "attenuation": 0
+            "kind": "iq",
+            "frequency": 4160866475
         },
         "3/drive12": {
-            "kind": "qblox-iq",
-            "frequency": 3948921000,
-            "attenuation": 0
+            "kind": "iq",
+            "frequency": 3948921000
         },
         "3/probe": {
-            "kind": "qblox-iq",
-            "frequency": 5808000000,
-            "attenuation": 28
+            "kind": "iq",
+            "frequency": 5808000000
         },
         "4/drive": {
-            "kind": "qblox-iq",
-            "frequency": 4145153000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 4145153000
         },
         "4/drive12": {
-            "kind": "qblox-iq",
-            "frequency": 4143343000,
-            "attenuation": 26
+            "kind": "iq",
+            "frequency": 4143343000
         },
         "4/probe": {
-            "kind": "qblox-iq",
-            "frequency": 5531000000,
-            "attenuation": 28
+            "kind": "iq",
+            "frequency": 5531000000
         },
         "0/acquisition": {
             "kind": "acquisition",
@@ -168,31 +153,38 @@
         },
         "qrm_rf0/o1/lo": {
             "kind": "oscillator",
-            "frequency": 5100000000
+            "frequency": 5100000000,
+            "power": 28
         },
         "qrm_rf1/o1/lo": {
             "kind": "oscillator",
-            "frequency": 5840000000
+            "frequency": 5840000000,
+            "power": 28
         },
         "qcm_rf0/o1/lo": {
             "kind": "oscillator",
-            "frequency": 4410592000
+            "frequency": 4410592000,
+            "power": 26
         },
         "qcm_rf0/o2/lo": {
             "kind": "oscillator",
-            "frequency": 4738318000
+            "frequency": 4738318000,
+            "power": 26
         },
         "qcm_rf1/o1/lo": {
             "kind": "oscillator",
-            "frequency": 4336921000
+            "frequency": 4336921000,
+            "power": 0
         },
         "qcm_rf1/o2/lo": {
             "kind": "oscillator",
-            "frequency": 4278819000
+            "frequency": 4278819000,
+            "power": 26
         },
         "qcm_rf2/o1/lo": {
             "kind": "oscillator",
-            "frequency": 4305409000
+            "frequency": 4305409000,
+            "power": 26
         },
         "qrm_rf1/o1/mixer": {
             "kind": "iq-mixer",
diff --git a/iqm5q/platform.py b/iqm5q/platform.py
index efcefe2f..9cede755 100644
--- a/iqm5q/platform.py
+++ b/iqm5q/platform.py
@@ -1,7 +1,6 @@
 import pathlib
 
-from qibolab import ConfigKinds, Platform, Qubit
-from qibolab._core.instruments.qblox.channels import QbloxConfigs
+from qibolab import Platform, Qubit
 from qibolab._core.instruments.qblox.cluster import Cluster
 from qibolab._core.instruments.qblox.platform import map_ports
 from qibolab._core.platform.platform import QubitMap
@@ -9,9 +8,6 @@
 # from qibolab.instruments.qblox import Cluster, QbloxConfigs, map_ports
 from qibolab.instruments.rohde_schwarz import SGS100A
 
-# Register Qblox-specific configurations for parameters loading
-ConfigKinds.extend([QbloxConfigs])
-
 FOLDER = pathlib.Path(__file__).parent
 NAME = "iqm5q_qblox"
 ADDRESS = "192.168.0.6"