From 5667b36829e231ae44608ea59fdab8716a69dfd4 Mon Sep 17 00:00:00 2001 From: Andrea Date: Mon, 29 Jan 2024 11:19:29 +0400 Subject: [PATCH 1/2] fix: Fix dump in qq fit and add tests to cover it --- src/qibocal/cli/fit.py | 2 ++ tests/test_protocols.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qibocal/cli/fit.py b/src/qibocal/cli/fit.py index 63813d9ba..df4891afe 100644 --- a/src/qibocal/cli/fit.py +++ b/src/qibocal/cli/fit.py @@ -47,7 +47,9 @@ def fit(path, update): # dump updated runcard if platform is not None and update: # pragma: no cover # cannot test update since dummy may produce wrong values and trigger errors + (path / UPDATED_PLATFORM).mkdir(parents=True, exist_ok=True) dump_runcard(platform, path / UPDATED_PLATFORM) # dump json + (path / META).write_text(json.dumps(meta, indent=4)) diff --git a/tests/test_protocols.py b/tests/test_protocols.py index d94fd7f3f..5e570f0b8 100644 --- a/tests/test_protocols.py +++ b/tests/test_protocols.py @@ -95,8 +95,9 @@ def test_acquire_command(runcard, backend, platform, tmp_path): assert results_report.exit_code == 0 +@pytest.mark.parametrize("update", ["--update", "--no-update"]) @pytest.mark.parametrize("runcard", generate_runcard_single_protocol(), ids=idfn) -def test_fit_command(runcard, tmp_path): +def test_fit_command(runcard, update, tmp_path): """Test fit builder and report generated.""" (tmp_path / SINGLE_ACTION_RUNCARD).write_text(yaml.safe_dump(runcard)) runner = CliRunner() @@ -116,7 +117,7 @@ def test_fit_command(runcard, tmp_path): assert results.exit_code == 0 # perform fit - results_fit = runner.invoke(command, ["fit", str(tmp_path), "--no-update"]) + results_fit = runner.invoke(command, ["fit", str(tmp_path), update]) assert not results_fit.exception assert results_fit.exit_code == 0 From 76397f1be86ae0009ea540ee4446648caeeddac8 Mon Sep 17 00:00:00 2001 From: Andrea Date: Mon, 29 Jan 2024 11:49:49 +0400 Subject: [PATCH 2/2] fix: Fix GHZ_TO_HZ conversion in resonator fit --- .../protocols/characterization/flux_dependence/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qibocal/protocols/characterization/flux_dependence/utils.py b/src/qibocal/protocols/characterization/flux_dependence/utils.py index a0e9489e5..785667549 100644 --- a/src/qibocal/protocols/characterization/flux_dependence/utils.py +++ b/src/qibocal/protocols/characterization/flux_dependence/utils.py @@ -262,6 +262,6 @@ def resonator_flux_dependence_fit_bounds( left_bound, right_bound = qubit_flux_dependence_fit_bounds( qubit_frequency=qubit_frequency, bias=bias ) - left_bound += [bare_resonator_frequency - 0.5, 0] - right_bound += [bare_resonator_frequency + 0.5, 1] + left_bound += [bare_resonator_frequency * HZ_TO_GHZ - 0.5, 0] + right_bound += [bare_resonator_frequency * HZ_TO_GHZ + 0.5, 1] return (left_bound, right_bound)