Closed nielshaandbaek closed 5 years ago
@nielshaandbaek I have also fixed the tests on develop. If you merge the latest version into this PR the tests should pass.
I've checked the UHQA and RO lutman drivers. I've left a bunch of comments and I have two major points.
- The check for keyboard interrupt functionality was removed from the UHFQA driver. Could you add that back in.
Done.
- The ro lutman seems to have its own logic for determining if it needs to upload waveforms. I understood that that functionality should be part of the UHFQA itself as we discussed. Could you make it clear how it works/is supposed to work.
The RO LutMan has two different operating modes as you have defined it. Either single-pulse or normal DIO triggered mode. These modes require a different AWG program on the UHF. Currently, the RO LutMan keeps track of which of these two programs has been uploaded to the UHF and, if necessary, toggles between them. The actual waveform uploading is triggered by the user using the load_waveforms_onto_AWG_lookuptable
. I'm not really sure how else you would expect this to work. I thought the user would interface with the LutMan to change the waveforms and the logic in the LutMan would determine which 'wave_chX_cwYYY' parameter in the instrument to update.
According to @AdriaanRol, all changes featured in this pull request have been merged to enh/QCC_Integration and submitted to develop under pull request #587
Please use the following template for a pull request.
Fixes #92, #128, #123, #137, #140, #126, #132, #111, #96.
Changes proposed in this pull request:
load_waveform(s)_onto_AWG_lookuptable
for changing the waveforms. Note that the waveforms will only be updated on the instrument the next time the AWG is started. The available tests for the LutMan's have been updated and should pass again.It would be great if you could have a look at the changes @AdriaanRol and @wvlothuizen.
I am still seeing some failing tests on the develop branch, like test_gst.py, but I am not sure if this is expected.