Alazar add buffer completed callback #1234
Merged
+28
−29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This can be used to step another instrument or trigger something when a buffer is complete
astafan8
reviewed
Aug 17, 2018
| while (buffers_completed < self.buffers_per_acquisition.get()): | ||
| # Wait for the buffer at the head of the list of available | ||
| # buffers to be filled by the board. | ||
| buf = self.buffer_list[buffers_completed % allocated_buffers] | ||
| buf = self.buffer_list[buffers_completed % allocated_buffers ] |
astafan8
reviewed
Aug 17, 2018
| @@ -1227,3 +1228,6 @@ def post_acquire(self): | |||
| """ | |||
| raise NotImplementedError( | |||
| 'This method should be implemented in a subclass') | |||
|
|
|||
| def buffer_done_callback(self, buffer_number): | |||
There was a problem hiding this comment.
buffer_number or buffers_completed? and, no docs again? :(
astafan8
reviewed
Aug 17, 2018
Codecov Report
@@ Coverage Diff @@
## master #1234 +/- ##
=======================================
Coverage 79.18% 79.18%
=======================================
Files 52 52
Lines 7201 7201
=======================================
Hits 5702 5702
Misses 1499 1499 |
astafan8
reviewed
Aug 27, 2018
| @@ -679,8 +680,9 @@ def acquire(self, mode=None, samples_per_record=None, | |||
| # -----set final configurations----- | |||
|
|
|||
| # Abort any previous measurement | |||
| # With AlazarAbortAsyncRead in a finally clause below | |||
| # this should be fully redundant and is rather slow | |||
| self._call_dll('AlazarAbortAsyncRead', self._handle) | |||
There was a problem hiding this comment.
since it "should be" redundant, shall this line be removed?
|
@jenshnielsen Do you think we can merge this, or is there more stuff coming? (to me it seems that this can be safely merged.) |
|
I think this is safe to merge. Lets remove the redundant line first |
astafan8
approved these changes
Aug 27, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The idea is to enable the user to perform an action such as stepping another instrument once a buffer is complete. There is a small performance hit of this. According to my benchmarks this costs ~80 ns per iteration if the function is a noopt.
Also fix some invalid parameters in the Alazar 9360 driver