Skip to content
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

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Photon counting #25

wants to merge 16 commits into from

Conversation

campagnola
Copy link
Contributor

No description provided.

@@ -12,29 +12,16 @@
from acq4.util.debug import printExc
Copy link
Contributor Author

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.

Copy link
Contributor

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.

@campagnola
Copy link
Contributor Author

Looks great to me! I'm pleased that once you had counter support for the DAQ, the remaining changes appeared to be very simple.
One issue: the nidaq linux cache file was removed; that should be restored (ideally in an interactive rebase, since the cache files are large).

@mgraupe mgraupe deleted the photon-counting branch June 26, 2015 09:30
@campagnola campagnola deleted the branch acq4:develop October 8, 2021 22:42
@campagnola campagnola closed this Oct 8, 2021
@campagnola campagnola reopened this Oct 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants