Extend LoadEventNexus For MultiPeriod Events #12963
Merged
Conversation
This file contains 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
Create synthetic nperiods log entry. The nperiods entry is present in the file, but not in the logs section. Having this will make the logs given to LoadEventNexus contain the same nperiods entry we currently have on the histogram workspaces.
Before I convert this to a vector of workspaces, I notice that the same variable name WS is used both for local variables, and member variables. This is utterly stupid and bound to cause problems in the future, so i'm fixing the naming here first.
We want to know where we are explicitly accessing the held single member workspace, as this is going to change and will otherwise be the source of bugs.
Decorator now holds vector workspaces corresponding to periods. Decorator initializes vector of workspaces once n-periods has been determined.
While maintaining backwards compatibility, ensure that any action done on our Decorated workspace is now done on the complete set of workspaces we have.
We do not allow loading of monitors in event mode for multiperiod event data.
Rough tests of output.
OwenArnold
added
High Priority
Fix warnings. Refactor DecoratorWorkspace into it's own physical unit. LoadEventNexus is already too big! A few tests added to that type in the process and forward declares used.
…ultiperiod_event_loading
Some of the LET files have all zeros for the period number. We fix these to be 1.
| @@ -2776,7 +2820,7 @@ void LoadEventNexus::loadTimeOfFlightData(::NeXus::File &file, | |||
| * @param WS : pointer to the workspace | |||
| */ | |||
| void LoadEventNexus::loadSampleDataISIScompatibility( | |||
| ::NeXus::File &file, Mantid::API::MatrixWorkspace_sptr WS) { | |||
| ::NeXus::File &file, DecoratorWorkspace * const WS) { | |||
There was a problem hiding this comment.
Is there anyreason why WS can't be taken by non-const reference rather than pointer?
|
This looks fine and the plots comparing |
martyngigg
added a commit
that referenced
this pull request
Jul 6, 2015
…loading Extend LoadEventNexus For MultiPeriod Events
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.
Issue #12776. Extend LoadEventNexus to handle multiperiod event nexus format files.