search

QudevETH / PycQED_py3

Python3 version of PycQED using QCodes as backend
MIT License
9 stars 7 forks source link

new ZI driver files from DiCarloLab-Delft/PycQED_py3 #194

Closed chellings closed 3 years ago

chellings commented 3 years ago

new ZI driver files from DiCarloLab-Delft/PycQED_py3

Changes from Delft and various PRs (https://github.com/DiCarloLab-Delft/PycQED_py3/pulls?q=is%3Apr+author%3Anielshaandbaek) by Niels H., including compatibility with LabOne 20.08.

The code in this pull request is a merge of our changes and the changes in Delft since the last big update (fall 2019). I have done this merge mostly based on my knowledge of git, not based on my knowledge of the code ;-). So it is necessary that people who know these drivers better than me have a look and check whether all changes from Delft make sense for us. Inviting @antsr and @MichKe95 to do this :-). Thank you!

I create this as a draft pull request to make it easier for you to see the changes. We should turn it into a real pull request after some tests on a setup.

To see how I merged our code with the code from DiCarloLab-Delft/PycQED_py3, check out the branch devel/ZI_driver_merge. The result of this merge is added here as commit 2a61e58. Retrospectively, it looks easy, but it took me quite a while to figure out how I can merge something between these completely diverged repositories. Keeping and maintaining the branch devel/ZI_driver_merge will facilitate future driver updates.

FYI @nathlacroix @stephlazar

chellings commented 3 years ago

Short update: successfully tested on a virtual setup and with real instruments on XLD (still old firmware, and no quantum device connected).

antsr commented 3 years ago

These changes have been in use now for quite some time on both of our pycqed setups. I believe we should also add the removal of the prefetch statements from LabOne 20.11 to this PR and then merge it.