Ticket #9543 (closed: fixed)
Add accumulation of monitor workspaces to LoadLiveData
Reported by: | Russell Taylor | Owned by: | Russell Taylor |
---|---|---|---|
Priority: | critical | Milestone: | Release 3.2 |
Component: | Framework | Keywords: | |
Cc: | Blocked By: | #9542 | |
Blocking: | #9540 | Tester: | Andrei Savici |
Description
If they are still present in the workspace after the processing step, they should be added together with any previously accumulated data in the same way as is done for the main workspace.
Change History
comment:4 Changed 6 years ago by Russell Taylor
- Status changed from assigned to inprogress
Re #9543. Correct indentation.
Changeset: cb397b5811ebb64b6c99dec3bbeef929216117d2
comment:5 Changed 6 years ago by Russell Taylor
Re #9543. Handle the addition of monitor workspace chunks.
This step explicitly adds monitor workspaces in addition to the main data. This means that if the monitor workspace is still present after the processing step (a user could extract it there if they wanted), it will be available for the post-processing or be carried right through to the output if there is no post-processing step.
Changeset: 374775a003b3e0051acb103eb574adcfcb4a7922
comment:6 Changed 6 years ago by Russell Taylor
Re #9543. Don't retain the accumulation workspace at run end.
I don't see why there is any need to keep a copy of this around if renaming at end of run. Just keep the principal output workspace.
Changeset: 7b67204eb086924afb1dc90396e039f14c7531eb
comment:7 Changed 6 years ago by Russell Taylor
Re #9543. Ensure the monitor workspace is kept at end of run.
If 'renaming' the run at the end is chosen, the Clone algorithm is run - override the default loss of the monitor workspace in this algorithm by pulling it out and cloning it as well (and then putting it back in).
Changeset: e077ee67711ab4ba3c20b28d77a6acf5051276b7
comment:8 Changed 6 years ago by Russell Taylor
Re #9543. Correct indentation.
Changeset: b449710b65eda0ead15f31f2db6913f07b39e073
comment:9 Changed 6 years ago by Russell Taylor
Re #9543. Handle the addition of monitor workspace chunks.
This step explicitly adds monitor workspaces in addition to the main data. This means that if the monitor workspace is still present after the processing step (a user could extract it there if they wanted), it will be available for the post-processing or be carried right through to the output if there is no post-processing step.
Changeset: 5ae98b23a2b057fd67812523366565c42910d67b
comment:10 Changed 6 years ago by Russell Taylor
Re #9543. Don't retain the accumulation workspace at run end.
I don't see why there is any need to keep a copy of this around if renaming at end of run. Just keep the principal output workspace.
Changeset: aff1ac2ee038dd0076e228ca1dee7e8c24156326
comment:11 Changed 6 years ago by Russell Taylor
Re #9543. Ensure the monitor workspace is kept at end of run.
If 'renaming' the run at the end is chosen, the Clone algorithm is run - override the default loss of the monitor workspace in this algorithm by pulling it out and cloning it as well (and then putting it back in).
Changeset: 92047595698e9dcef9a5aa7ef96db71468ad6c26
comment:12 Changed 6 years ago by Russell Taylor
N.B. The four duplicated commits above are due to a rebase of my branch.
comment:13 Changed 6 years ago by Russell Taylor
Re #9543. Clear Coverity warning.
Tangentially related to the work of the current ticket.
Changeset: 97510814f538c1c91cbaad6a4919e930b77b6173
comment:14 Changed 6 years ago by Russell Taylor
Re #9543. Remove unused variable.
Changeset: ab074a3c596db80e166c288376a2d62c8784a0fe
comment:15 Changed 6 years ago by Russell Taylor
Re #9543. Remove unused variable.
Changeset: d36bf3f5ed2000d8eef7f9a88fe1edf19e43a8bd
comment:16 Changed 6 years ago by Russell Taylor
Re #9543. Make sure monitor WS is kept if not preserving events.
Also add tests for this.
There's a call to ConvertToMatrixWorkspace if the option to preserve events is off in a live data run. This propagates any monitor workspace through this algorithm, though note that in the case of the SNS listener at least a Rebin or something needs to be performed on the monitor workspace to set the X boundaries.
Changeset: ded598c5c6e668fec83ed807ef8c8f0c85f00459
comment:17 Changed 6 years ago by Russell Taylor
Re #9543. Make sure monitor WS is kept if not preserving events.
Also add tests for this.
There's a call to ConvertToMatrixWorkspace if the option to preserve events is off in a live data run. This propagates any monitor workspace through this algorithm, though note that in the case of the SNS listener at least a Rebin or something needs to be performed on the monitor workspace to set the X boundaries.
Changeset: e29cf974d276aa6846702381b1ab9602e5df07b2
comment:18 Changed 6 years ago by Russell Taylor
Re #9543. Add an option to not clear the monitor workspace pointer.
This is particularly required to be able to use this algorithm in the post-processing step of a live data run. Unless this new property is set to false, things fail on the second time around because the monitor workspace has been cleared out of the accumulation workspace.
Changeset: 194ea5ab4e4466df5d33b360a1204fb3685d818a
comment:19 Changed 6 years ago by Russell Taylor
- Status changed from inprogress to verify
- Resolution set to fixed
To test: Probably needs to be an SNS person who can run live data pointing at a real instrument. Start up a live data run with no processing or post-processing steps. Running ExtractMonitorWorkspace on the final output should succeed, whether "Preserve Events" is checked or not. You can also run a one line script containing
ExtractMonitorWorkspace(input,OutputWorkspace=output)
as a processing script and then the final output workspace will be the monitors instead of the data. The same result can be achieved by running
ExtractMonitorWorkspace(input,OutputWorkspace=output,ClearFromInputWorkspace=False)
as a post-processing script. Don't forget the last option in that case.
comment:20 Changed 6 years ago by Andrei Savici
- Status changed from verify to verifying
- Tester set to Andrei Savici
comment:21 Changed 6 years ago by Andrei Savici
- Status changed from verifying to closed
Merge remote-tracking branch 'origin/feature/9543_accumulate_monitor_data_in_loadlivedata'
Full changeset: 9db74661df226657448e93588c721d58ef8cd142
comment:22 Changed 6 years ago by Andrei Savici
Documentation is part of #9592
comment:23 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 10386