Merged
Conversation
…into the vector and sorting them, we are using smart pointers so that the memory doesn't need to be moved around, just the pointers to them!
…of files to be sorted. This checks if we've got a file that wasn't closed properly and then forces it to be resorted if required.
Contributor
Author
Of course, there was a bug in the time ordering and it wasn't doing it correctly... Real result is: So not much different than before. |
…egative time differences
…pact on sorting time (~0.5 s extra)
…he time-ordering.
Contributor
Author
|
With the bugs fixed and using a mapping of data_id in the vector with timestamp, rather than calling it from the DataPackets class each time, we win another few seconds: |
…ging ROOT's memory management.
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
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 latest sorting upgrade, now using smart pointers inside the vector so that we don't need to move the data around when we sort it, only the pointers to the memory. Tested with 50 sub runs and it is significantly faster and doesn't appear to be leaking memory.
For a single subrun as comparison:
A factor of a 6.6 times faster overall.
This PR also includes Nigel's catch for corrupted input files in Issue #58.