Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e63318d
added test
wvlothuizen Apr 6, 2022
1c0de19
cleanup: grouped parameters related to compilation together
wvlothuizen Apr 6, 2022
1d22387
more cleanup, and added notes for improvement
wvlothuizen Apr 6, 2022
d3f0fe8
cleanup
wvlothuizen Apr 6, 2022
c478091
WIP on multiprocessing
wvlothuizen Apr 7, 2022
67c8777
Merge branch 'develop' of https://github.com/DiCarloLab-Delft/PycQED_…
wvlothuizen Apr 7, 2022
ee2dc5b
merged sim_single_qubits additions from Jorge
wvlothuizen Apr 7, 2022
cdd5a96
measure_two_qubit_randomized_benchmarking() now passes both sequentia…
wvlothuizen Apr 7, 2022
dacbda4
attempt to use dill, no success yet
wvlothuizen Apr 11, 2022
1ea3789
transformed measure_two_qubit_simultaneous_randomized_benchmarking, a…
wvlothuizen Apr 11, 2022
558e7c0
transformed measure_multi_qubit_simultaneous_randomized_benchmarking …
wvlothuizen Apr 11, 2022
1b31acb
measure_two_qubit_interleaved_randomized_benchmarking runs
wvlothuizen Apr 11, 2022
eab291d
WIP
wvlothuizen Apr 11, 2022
3287edc
removed Jorge's version of measure_two_qubit_randomized_benchmarking,…
wvlothuizen Apr 11, 2022
d8c7fbe
removed measure_single_qubit_interleaved_randomized_benchmarking_park…
wvlothuizen Apr 11, 2022
e39546a
solved merge mess
wvlothuizen Apr 11, 2022
d0b466f
also removed measure_single_qubit_randomized_benchmarking_parking
wvlothuizen Apr 11, 2022
ee98ed8
improved handling of common parameters
wvlothuizen Apr 11, 2022
327b84f
cleanup
wvlothuizen Apr 25, 2022
6b14f32
trigger CI (and updated Python versions for CI)
wvlothuizen May 23, 2022
bc4fa0f
disabled codecov
wvlothuizen May 23, 2022
5e22aa4
maked tests pass, with one workaround as indicated in test_measure_tw…
wvlothuizen May 24, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/python_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
max-parallel: 4
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8']
python-version: ['3.7', '3.8', '3.9']

steps:
- uses: actions/checkout@v1
Expand Down Expand Up @@ -56,9 +56,9 @@ jobs:
- name: Test with pytest
run: |
py.test pycqed/tests --cov=pycqed --cov-report xml --cov-report html --cov-config=.coveragerc
- name: Upload code coverage report
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r coverage.xml
codecov
env: # set secrets as environmental variables
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
# - name: Upload code coverage report
# run: |
# bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r coverage.xml
# codecov
# env: # set secrets as environmental variables
# CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
17 changes: 10 additions & 7 deletions pycqed/instrument_drivers/meta_instrument/HAL/HAL_ShimMQ.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import warnings
from collections import OrderedDict
import numpy as np
from typing import List
from deprecated import deprecated

from pycqed.measurement import detector_functions as det
Expand Down Expand Up @@ -211,7 +212,7 @@ def prepare_readout(self, qubits, reduced: bool = False):

def prepare_for_timedomain(
self,
qubits: list,
qubits: List[str],
reduced: bool = False,
bypass_flux: bool = False,
prepare_for_readout: bool = True
Expand Down Expand Up @@ -661,15 +662,17 @@ def _set_dio_map(self, dio_map_dict):
# private functions: prepare
##########################################################################

def _prep_ro_sources(self, qubits):
def _prep_ro_sources(self, qubits: List[str]):
"""
turn on and configure the RO LO's of all qubits to be measured and
update the modulation frequency of all qubits.
"""
log.info(f"preparing ro sources for qubits {qubits}")
# FIXME: This device object works under the assumption that a single LO
# is used to drive all readout lines.
LO = self.find_instrument(qubits[0]).instr_LO_ro.get_instr()
RO_lutman = self.find_instrument(qubits[0]).instr_LutMan_RO.get_instr()
qb = self.find_instrument(qubits[0])
LO = qb.instr_LO_ro.get_instr()
RO_lutman = qb.instr_LutMan_RO.get_instr()
LO.frequency.set(RO_lutman.LO_freq())
LO.power(self.ro_pow_LO())
LO.on()
Expand All @@ -690,7 +693,7 @@ def _prep_ro_sources(self, qubits):
LO_q.on()
#raise ValueError("Expect a single LO to drive all feedlines")

def _prep_ro_assign_weights(self, qubits):
def _prep_ro_assign_weights(self, qubits: List[str]):
"""
Assign acquisition weight channels to the different qubits.

Expand Down Expand Up @@ -755,7 +758,7 @@ def _prep_ro_assign_weights(self, qubits):
return acq_ch_map

# FIXME: align with HAL_ShimSQ::_prep_ro_integration_weights
def _prep_ro_integration_weights(self, qubits):
def _prep_ro_integration_weights(self, qubits: List[str]):
"""
Set the acquisition integration weights on each channel.

Expand Down Expand Up @@ -823,7 +826,7 @@ def _prep_ro_integration_weights(self, qubits):
raise NotImplementedError('ro_acq_weight_type "{}" not supported'.format(self.ro_acq_weight_type()))

# FIXME: align with HAL_ShimSQ::_prep_ro_pulses
def _prep_ro_pulses(self, qubits):
def _prep_ro_pulses(self, qubits: List[str]):
"""
Configure the ro lutmans.

Expand Down
Loading