Alazar acquisition controller: adding average postdemod to PostDemodCtl & making RawCtl compatible with Alazar 9870 - #50
Open
abargerbos wants to merge 2 commits into
Open
Alazar acquisition controller: adding average postdemod to PostDemodCtl & making RawCtl compatible with Alazar 9870#50abargerbos wants to merge 2 commits into
abargerbos wants to merge 2 commits into
Conversation
abargerbos
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
I added two changes to rf.alazar.acquisition_controllers, which in hindsight should probably be two different pull requests?
The first is to add the option for averaging your alazar data post demodulation to PostDemodCtl. Right now you can only average before demodulation, which is faster, but puts precise timing constraints on your measurements. These are not always met, in which case you can only average your buffers together post demodulation.
The second is a bugfix for the RawAcqCtl, which uses a utility function 'rescale'. Even though RawAcqCtl has a paramter nbits that stores the number of bits of the Alazar card uses, 'rescale' hardcodes the datatype returned by the alazar to be nb.uint16 inside the decorator of '_rescale'.
For now I made a rather stupid fix to this, by defining another function, rescale_8bit. That is because I could not figure out how to make the decorator of _rescale depend on an input parameter. If someone can point out how to do so, we can keep just a single rescaling function rather than adding a second one.
Neither changes should break anything for existing users; the post_demod averaging is False by default, and the RawAcqCtl is currently already broken for anyone not using the 12 bit Alazar card.