Ticket #7840 (closed: fixed)
[C2E] Add scale factor for resolution files
| Reported by: | Samuel Jackson | Owned by: | Samuel Jackson |
|---|---|---|---|
| Priority: | major | Milestone: | Release 3.0 |
| Component: | Indirect Inelastic | Keywords: | |
| Cc: | spencer.howells@… | Blocked By: | |
| Blocking: | Tester: | Peter Parker |
Description
Add a separate scale option to the resolution section of the calibration tab that does the same thing as intensity scale factor, but instead of affecting both the calibration and resolution files there should be a separate option for both.
Change History
comment:2 Changed 7 years ago by Samuel Jackson
Merge branch 'feature/7840_c2e_add_scale_to_res' into develop
Refs #7840
Conflicts:
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
Changeset: d141b83ac70388552f9e253cb6fa9b31978470bf
comment:3 Changed 7 years ago by Samuel Jackson
- Status changed from inprogress to verify
- Resolution set to fixed
comment:4 Changed 7 years ago by Samuel Jackson
- Milestone changed from Backlog to Release 3.0
To Tester
On the calibration tab in the C2E interface there is a new option to scale the resolution file separately from scaling the calibration file. Check that when choosing "Create RES" the output *_res file is scaled according to the value specified.
Some instructions for running calibration can be found here: http://www.mantidproject.org/Indirect:ConvertToEnergy
comment:5 Changed 7 years ago by Peter Parker
- Status changed from verify to verifying
- Tester set to Peter Parker
comment:6 Changed 7 years ago by Peter Parker
- Status changed from verifying to reopened
- Resolution fixed deleted
Sorry Sam, I'm having trouble getting the merge to work properly and I'm not keen on committing it straight to master. Can I pass this back to you so you can merge master into the branch?
I am more than happy to pass the ticket otherwise.
comment:7 Changed 7 years ago by Samuel Jackson
- Status changed from reopened to inprogress
Merge remote-tracking branch 'origin/master' into feature/7840_c2e_add_scale_to_res
Conflicts:
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
Refs #7840
Changeset: 05a3ff6ffe1ebc9f5bb6936a8330190a29bca00e
comment:8 Changed 7 years ago by Samuel Jackson
- Status changed from inprogress to verify
- Resolution set to fixed
The conflict should hopefully now be resolved.
comment:10 Changed 7 years ago by Peter Parker
- Status changed from verifying to closed
Merge remote-tracking branch 'origin/feature/7840_c2e_add_scale_to_res'
Full changeset: 77b2f87037bc9b858f14ffc426f68c7c3b276c35
comment:11 Changed 7 years ago by Peter Parker
Conflict fixed. Changes look good.
comment:12 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 8685
Refs #7840 added new scale factor option to resolution file.
Changeset: 866efd8cbfddb5ac84520fef2c06e2af0725df5c