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

Bugfixes from the DAQ test #118

Merged
merged 30 commits into from Jan 11, 2019
Merged

Conversation

JelleAalbers
Copy link
Member

@JelleAalbers JelleAalbers commented Dec 4, 2018

This contains several bugfixes discovered during the test of the new DAQ, described in the individual commits. Several of these came to light only now due to the somewhat "interesting" waveforms seen in the initial data.

I will likely add to this during this week.

@JelleAalbers JelleAalbers changed the title Bugiixes from the DAQ test Bugfixes from the DAQ test Dec 4, 2018
XENON EB0 Superman and others added 19 commits December 6, 2018 12:19
We first merge iters of the same kind, then sync different kinds by time, rather than the other way round. This should help avoid deadlocks caused by one kind having much larger chunks than the other, by ensuring the iteration over the small-chunked kind data is symmetric.

For example, if you depend on events (large time chunks), peaks, and peak_classification, you might previously ask first for 1000 peaks chunks, then 1000 peak_classification chunks. Now you will ask for 1 peak chunk, 1 peak_cl chunk, 1 peak chunk, etc.
@JelleAalbers JelleAalbers merged commit 565df72 into AxFoundation:master Jan 11, 2019
@JelleAalbers JelleAalbers deleted the daqtest branch January 11, 2019 15:59
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