New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Photon counting #25
base: develop
Are you sure you want to change the base?
Photon counting #25
Conversation
@@ -12,29 +12,16 @@ | |||
from acq4.util.debug import printExc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes should be removed from this branch. You can use rebase -i
and skip the merge commit, or I'll do it after the PR is ready to merge.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry. I am not quite sure how to do it.
git checkout photon-counting
git rebase -i
??
Thanks.
Looks great to me! I'm pleased that once you had counter support for the DAQ, the remaining changes appeared to be very simple. |
…and in SuperTask.py
…on the device family, which is queried in configureClocks of Supertask.py.
…only if more than one device is involved.
…igital signal from the photo-multipier - instead of recording the PMT output through the analog input.
No description provided.