search

DiCarloLab-Delft / PycQED_py3

Python3 version of PycQED using QCoDeS as backend
MIT License
67 stars 41 forks source link

Merge of QI setup #637

Closed elrama- closed 3 years ago

elrama- commented 3 years ago

This issue is to track status of merging situation on QI

elrama- commented 3 years ago

Notes on merging decisions (Merging session with @MiguelSMoreira ):

pycqed/analysis_v2/timedomain_analysis.py We had to "keep theirs" by hand pycqed/analysis_v2/tomography_2q_v2.py We kept theirs

pycqed/instrument_drivers/meta_instrument/LutMans/flux_lutman.py (!) merged two Flux Lutmans into one file (SNZ, Adiabatic) pycqed/instrument_drivers/meta_instrument/device_object_CCL.py Kept theirs. pycqed/instrument_drivers/meta_instrument/qubit_objects/CCL_Transmon.py Kept theirs. pycqed/instrument_drivers/physical_instruments/ZurichInstruments/ZI_HDAWG8.py Kept ours (calibration for 128 codewords). pycqed/measurement/detector_functions.py Kept ours (synchronisation worked out better after hiccups a while ago). pycqed/measurement/measurement_control.py Kept Minimizer stuff from Victor. pycqed/measurement/openql_experiments/clifford_rb_oql.py Kept theirs for cases, but kept right extension (vq1asm instead of qisa) pycqed/measurement/openql_experiments/multi_qubit_oql.py Kept theirs, but will need review Cond. Osc. Verify MSQ/LSQ notation on tomogrphy.

elrama- commented 3 years ago

Just tested with Miguel:

Multiqubit mux SSRO T1, Echo, AllXY, 1Q RB Conditional Oscillations for CZ gates 2Q RB

Everything looks fine.