diff --git a/tests/dummy_qrc/qblox/parameters.json b/tests/dummy_qrc/qblox/parameters.json index 41cf5bee7..8c6e94eff 100644 --- a/tests/dummy_qrc/qblox/parameters.json +++ b/tests/dummy_qrc/qblox/parameters.json @@ -37,39 +37,33 @@ "qcm_rf0": { "o1": { "attenuation": 20, - "lo_frequency": 5252833073, - "gain": 0.47 + "lo_frequency": 5252833073 }, "o2": { "attenuation": 20, - "lo_frequency": 5652833073, - "gain": 0.57 + "lo_frequency": 5652833073 } }, "qcm_rf1": { "o1": { "attenuation": 20, - "lo_frequency": 5995371914, - "gain": 0.55 + "lo_frequency": 5995371914 }, "o2": { "attenuation": 20, - "lo_frequency": 6961018001, - "gain": 0.596 + "lo_frequency": 6961018001 } }, "qcm_rf2": { "o1": { "attenuation": 20, - "lo_frequency": 6786543060, - "gain": 0.47 + "lo_frequency": 6786543060 } }, "qrm_rf_a": { "o1": { "attenuation": 36, - "lo_frequency": 7300000000, - "gain": 0.6 + "lo_frequency": 7300000000 }, "i1": { "acquisition_hold_off": 500, @@ -79,8 +73,7 @@ "qrm_rf_b": { "o1": { "attenuation": 36, - "lo_frequency": 7850000000, - "gain": 0.6 + "lo_frequency": 7850000000 }, "i1": { "acquisition_hold_off": 500, diff --git a/tests/dummy_qrc/qblox/platform.py b/tests/dummy_qrc/qblox/platform.py index 6c7c47be3..bf660c92d 100644 --- a/tests/dummy_qrc/qblox/platform.py +++ b/tests/dummy_qrc/qblox/platform.py @@ -55,7 +55,6 @@ def create(folder: pathlib.Path = FOLDER): twpa_pump.name: twpa_pump, } instruments.update(modules) - instruments = load_instrument_settings(runcard, instruments) # Create channel objects channels = ChannelMap() @@ -109,6 +108,7 @@ def create(folder: pathlib.Path = FOLDER): qubits[q].flux.max_bias = 2.5 settings = load_settings(runcard) + instruments = load_instrument_settings(runcard, instruments) return Platform( str(FOLDER), qubits, pairs, instruments, settings, resonator_type="2D" diff --git a/tests/test_instruments_qblox_cluster_qcm_rf.py b/tests/test_instruments_qblox_cluster_qcm_rf.py index 46c0799e4..c71e84226 100644 --- a/tests/test_instruments_qblox_cluster_qcm_rf.py +++ b/tests/test_instruments_qblox_cluster_qcm_rf.py @@ -70,11 +70,6 @@ def test_init(qcm_rf: QcmRf): assert type(qcm_rf._ports) == dict -def test_setup(qcm_rf: QcmRf): - qcm_rf.setup(**SETTINGS) - assert qcm_rf.settings == SETTINGS - - @pytest.mark.qpu def test_connect(connected_qcm_rf: QcmRf): qcm_rf = connected_qcm_rf diff --git a/tests/test_instruments_qblox_cluster_qrm_rf.py b/tests/test_instruments_qblox_cluster_qrm_rf.py index 01898d2d4..ff54bdc48 100644 --- a/tests/test_instruments_qblox_cluster_qrm_rf.py +++ b/tests/test_instruments_qblox_cluster_qrm_rf.py @@ -68,11 +68,6 @@ def test_init(qrm_rf: QrmRf): assert qrm_rf.device == None -def test_setup(qrm_rf: QrmRf): - qrm_rf.setup(**SETTINGS) - assert qrm_rf.settings == SETTINGS - - @pytest.mark.qpu def test_connect(connected_qrm_rf: QrmRf): qrm_rf = connected_qrm_rf