Ticket #10854 (closed: fixed)
Rewrite indirect energy transfer reduction algorithm
| Reported by: | Dan Nixon | Owned by: | Dan Nixon |
|---|---|---|---|
| Priority: | major | Milestone: | Release 3.4 |
| Component: | Indirect Inelastic | Keywords: | |
| Cc: | Blocked By: | ||
| Blocking: | #9093, #11431 | Tester: | Roman Tolchenov |
Description
The current algorithm is kind of a bodge using the Python reducer which is planned to be removed.
Change History
comment:3 Changed 6 years ago by Dan Nixon
Add common code borrowed from the diffraction routine
Eventually when both tickets are passed the common features will be moved to their own source file
Refs #10854
Changeset: a3fb7009944d3c41033fb9ea079caef13ac86ea5
comment:4 Changed 6 years ago by Dan Nixon
Added backround removal, calibration division
Added some unit tests for validation
Refs #10854
Changeset: b2af9b32d1511f6d2734ab63671fffcd1d863283
comment:6 Changed 6 years ago by Dan Nixon
Pretty much working for non-framed data
Reducing a vanadium run when providing the vanadium calibration gives a near constant set of data at least.
Refs #10854
Changeset: 980fbea605a74cfb6f9ab47a47e9d88e77279aef
comment:7 Changed 6 years ago by Dan Nixon
Fix issue with monitors, support framed data
Refs #10854
Changeset: 64d372ec6314a3cf720e2944e36ae7ece60b3c54
comment:8 Changed 6 years ago by Dan Nixon
Fix plotting form non folded framed data
Refs #10854
Changeset: 8bfbfaa53424ebb01bd3ff96f54e0e23cf8fa24b
comment:10 Changed 6 years ago by Dan Nixon
Rename properties to match diffraction algo
Refs #10854
Changeset: 203f63f6a4271fc52e1041a8b2fff2cdb73da7a3
comment:11 Changed 6 years ago by Dan Nixon
comment:12 Changed 6 years ago by Dan Nixon
comment:13 Changed 6 years ago by Dan Nixon
Replace use of old algo on ET tab
Need to add algorithms for saving
Refs #10854
Changeset: 803f199a9932ffd6d5cd765495886ff4a88ecb82
comment:14 Changed 6 years ago by Dan Nixon
comment:15 Changed 6 years ago by Dan Nixon
Swap usage in calibration and resolution algorithms
Refs #10854
Changeset: 72373bf3f863f922891e89c4cda0b880d164985c
comment:16 Changed 6 years ago by Dan Nixon
Removed old algorithm, updated docs and test
Refs #10854
Changeset: 4e946effa877ee7d1ceb6113da55a9e59f429954
comment:17 Changed 6 years ago by Dan Nixon
Remove use of a reduction step in Calibration algorithm
Refs #10854
Changeset: 8ec208b47d9b8ed468c78c5653cd752659e384ec
comment:18 Changed 6 years ago by Dan Nixon
comment:19 Changed 6 years ago by Dan Nixon
comment:20 Changed 6 years ago by Dan Nixon
comment:21 Changed 6 years ago by Dan Nixon
comment:22 Changed 6 years ago by Dan Nixon
Correct rebinning options for multiple frames
Refs #10854
Changeset: b1581327264f5a067e4c3c93c74ae6368a90ee8a
comment:23 Changed 6 years ago by Dan Nixon
comment:24 Changed 6 years ago by Dan Nixon
comment:25 Changed 6 years ago by Dan Nixon
comment:26 Changed 6 years ago by Dan Nixon
Proper support for summing chopped runs
Fixes another TOSCA system test
Refs #10854
Changeset: ee70ffafc85408f3e5241c1638065937971eeff2
comment:27 Changed 6 years ago by Dan Nixon
Remove huge tolerance and debugging save
Refs #10854
Changeset: b41fa7c1aeec11893d979b23b405eef7c54a2e71
comment:28 Changed 6 years ago by Dan Nixon
comment:29 Changed 6 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.ui Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp
Refs #10854
Changeset: 81b9db99856dcc626abe777d4bee7b2930cc0517
comment:30 Changed 6 years ago by Dan Nixon
Fix errors in merging master into branch
Refs #10854
Changeset: f73b1e1e4fc02291cc16d72d2401e680e56a442a
comment:31 Changed 6 years ago by Dan Nixon
comment:32 Changed 6 years ago by Dan Nixon
- Summary changed from Rewrite indirect reduction algorithm to Rewrite indirect energy transfer reduction algorithm
comment:35 Changed 6 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp
Refs #10854
Changeset: 4d513ec8f98e80b53d2ef776df2c1254a1fd5b80
comment:38 Changed 6 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateCalibrationWorkspace.py Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
Refs #10854
Changeset: 21305709f56ddd01823b001bb7f1c8912c1dd27a
comment:39 Changed 6 years ago by Dan Nixon
comment:40 Changed 6 years ago by Dan Nixon
comment:41 Changed 6 years ago by Dan Nixon
Passes unit, doc and some system tests
Refs #10854
Changeset: b27e60285f5dee8b1e208a34226e5f91c0440148
comment:42 Changed 6 years ago by Dan Nixon
Use new algorithm in systemtests
IRIS and OSIRIS passing, TOSCA failing
Refs #10854
Changeset: 1c211b0c377962d63439b45c0b0995a71e2e0677
comment:43 Changed 6 years ago by Dan Nixon
Imporve error logging, fold by default
Refs #10854
Changeset: bd85d9ad06a72ac1d99d0183630eb87d8bd74f23
comment:44 Changed 6 years ago by Dan Nixon
IPF mapping by default
Fixes all but 1 TOSCA system test
Refs #10854
Changeset: 23d78431980485fd3a83ed56d5c9a731188d2bde
comment:45 Changed 6 years ago by Dan Nixon
The last failing TOSCA test I think is due to out of data reference results when several detectors were removed from the grouping as they did not work at the time.
Will check this with Svemir and Stewart.
comment:46 Changed 6 years ago by Dan Nixon
comment:47 Changed 6 years ago by Dan Nixon
comment:49 Changed 6 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/InelasticIndirectReduction.py Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/InelasticIndirectReductionTest.py Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py Code/Mantid/docs/source/algorithms/CreateCalibrationWorkspace-v1.rst
Refs #10854
Changeset: e00d11f89a4edccfc3b3ccc9e58bc85c075c4f97
comment:50 Changed 6 years ago by Dan Nixon
Correct systemtest for change in detector masking
Refs #10854
Changeset: f6af311f850cf50229e6342e9a696b72b6bb94fc
comment:51 Changed 6 years ago by Dan Nixon
comment:52 Changed 6 years ago by Dan Nixon
- Status changed from inprogress to verify
- Resolution set to fixed
This is being verified as pull request #518.
comment:53 Changed 6 years ago by Stuart Campbell
Is this just an ISIS thing ? How does it fit in with the plans to produce a workflow algorithm similar to DgsReduction but for Indirect ?
comment:54 Changed 6 years ago by Dan Nixon
@stuartcampbell It is indeed ISIS only. If I had known about the plan to make a (I assume) cross facility workflow algorithm then I would have considered it before starting work on this.
comment:55 Changed 6 years ago by Dan Nixon
comment:56 Changed 6 years ago by Dan Nixon
comment:57 Changed 6 years ago by Dan Nixon
Re add output file test and clean up test script
Refs #10854
Changeset: 82f6f1d87c2c4c6de6a88f960e5eda5cd6191669
comment:58 Changed 6 years ago by Dan Nixon
Fix test failure due to Python version
Refs #10854
Changeset: a25359fb1823fcdda6938be81756060e5f6e7085
comment:59 Changed 6 years ago by Roman Tolchenov
- Status changed from verify to verifying
- Tester set to Roman Tolchenov
comment:60 Changed 6 years ago by Roman Tolchenov
Could you resolve the conflicts please?
comment:61 Changed 6 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
Refs #10854
Changeset: eaa040bce5024f612e5e7e14360b03004d6708a1
comment:62 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
Refs #10854
Changeset: 576c8f695ed72caefadb22f152fecbdfc5ed27fa
comment:63 Changed 5 years ago by Dan Nixon
comment:64 Changed 5 years ago by Dan Nixon
Add common code borrowed from the diffraction routine
Eventually when both tickets are passed the common features will be moved to their own source file
Refs #10854
Changeset: a3fb7009944d3c41033fb9ea079caef13ac86ea5
comment:65 Changed 5 years ago by Dan Nixon
Added backround removal, calibration division
Added some unit tests for validation
Refs #10854
Changeset: b2af9b32d1511f6d2734ab63671fffcd1d863283
comment:66 Changed 5 years ago by Dan Nixon
comment:67 Changed 5 years ago by Dan Nixon
Pretty much working for non-framed data
Reducing a vanadium run when providing the vanadium calibration gives a near constant set of data at least.
Refs #10854
Changeset: 980fbea605a74cfb6f9ab47a47e9d88e77279aef
comment:68 Changed 5 years ago by Dan Nixon
Fix issue with monitors, support framed data
Refs #10854
Changeset: 64d372ec6314a3cf720e2944e36ae7ece60b3c54
comment:69 Changed 5 years ago by Dan Nixon
Fix plotting form non folded framed data
Refs #10854
Changeset: 8bfbfaa53424ebb01bd3ff96f54e0e23cf8fa24b
comment:70 Changed 5 years ago by Dan Nixon
comment:71 Changed 5 years ago by Dan Nixon
Rename properties to match diffraction algo
Refs #10854
Changeset: 203f63f6a4271fc52e1041a8b2fff2cdb73da7a3
comment:72 Changed 5 years ago by Dan Nixon
comment:73 Changed 5 years ago by Dan Nixon
Replace use of old algo on ET tab
Need to add algorithms for saving
Refs #10854
Changeset: 803f199a9932ffd6d5cd765495886ff4a88ecb82
comment:74 Changed 5 years ago by Dan Nixon
comment:75 Changed 5 years ago by Dan Nixon
Swap usage in calibration and resolution algorithms
Refs #10854
Changeset: 72373bf3f863f922891e89c4cda0b880d164985c
comment:76 Changed 5 years ago by Dan Nixon
Removed old algorithm, updated docs and test
Refs #10854
Changeset: 4e946effa877ee7d1ceb6113da55a9e59f429954
comment:77 Changed 5 years ago by Dan Nixon
Remove use of a reduction step in Calibration algorithm
Refs #10854
Changeset: 8ec208b47d9b8ed468c78c5653cd752659e384ec
comment:78 Changed 5 years ago by Dan Nixon
comment:79 Changed 5 years ago by Dan Nixon
comment:80 Changed 5 years ago by Dan Nixon
comment:81 Changed 5 years ago by Dan Nixon
Correct rebinning options for multiple frames
Refs #10854
Changeset: b1581327264f5a067e4c3c93c74ae6368a90ee8a
comment:82 Changed 5 years ago by Dan Nixon
comment:83 Changed 5 years ago by Dan Nixon
Proper support for summing chopped runs
Fixes another TOSCA system test
Refs #10854
Changeset: ee70ffafc85408f3e5241c1638065937971eeff2
comment:84 Changed 5 years ago by Dan Nixon
comment:85 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataReduction.ui Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp
Refs #10854
Changeset: 81b9db99856dcc626abe777d4bee7b2930cc0517
comment:86 Changed 5 years ago by Dan Nixon
Fix errors in merging master into branch
Refs #10854
Changeset: f73b1e1e4fc02291cc16d72d2401e680e56a442a
comment:87 Changed 5 years ago by Dan Nixon
comment:88 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp
Refs #10854
Changeset: 4d513ec8f98e80b53d2ef776df2c1254a1fd5b80
comment:89 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateCalibrationWorkspace.py Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
Refs #10854
Changeset: 21305709f56ddd01823b001bb7f1c8912c1dd27a
comment:90 Changed 5 years ago by Dan Nixon
comment:91 Changed 5 years ago by Dan Nixon
comment:92 Changed 5 years ago by Dan Nixon
Passes unit, doc and some system tests
Refs #10854
Changeset: b27e60285f5dee8b1e208a34226e5f91c0440148
comment:93 Changed 5 years ago by Dan Nixon
Use new algorithm in systemtests
IRIS and OSIRIS passing, TOSCA failing
Refs #10854
Changeset: 1c211b0c377962d63439b45c0b0995a71e2e0677
comment:94 Changed 5 years ago by Dan Nixon
Imporve error logging, fold by default
Refs #10854
Changeset: bd85d9ad06a72ac1d99d0183630eb87d8bd74f23
comment:95 Changed 5 years ago by Dan Nixon
IPF mapping by default
Fixes all but 1 TOSCA system test
Refs #10854
Changeset: 23d78431980485fd3a83ed56d5c9a731188d2bde
comment:96 Changed 5 years ago by Dan Nixon
comment:97 Changed 5 years ago by Dan Nixon
comment:98 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/InelasticIndirectReduction.py Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/InelasticIndirectReductionTest.py Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py Code/Mantid/docs/source/algorithms/CreateCalibrationWorkspace-v1.rst
Refs #10854
Changeset: e00d11f89a4edccfc3b3ccc9e58bc85c075c4f97
comment:99 Changed 5 years ago by Dan Nixon
Correct systemtest for change in detector masking
Refs #10854
Changeset: f6af311f850cf50229e6342e9a696b72b6bb94fc
comment:100 Changed 5 years ago by Dan Nixon
comment:101 Changed 5 years ago by Dan Nixon
comment:102 Changed 5 years ago by Dan Nixon
comment:103 Changed 5 years ago by Dan Nixon
Re add output file test and clean up test script
Refs #10854
Changeset: 82f6f1d87c2c4c6de6a88f960e5eda5cd6191669
comment:104 Changed 5 years ago by Dan Nixon
Fix test failure due to Python version
Refs #10854
Changeset: a25359fb1823fcdda6938be81756060e5f6e7085
comment:105 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ISISEnergyTransfer.ui Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ISISEnergyTransfer.cpp
Refs #10854
Changeset: eaa040bce5024f612e5e7e14360b03004d6708a1
comment:106 Changed 5 years ago by Dan Nixon
Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts:
Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
Refs #10854
Changeset: 576c8f695ed72caefadb22f152fecbdfc5ed27fa
comment:107 Changed 5 years ago by Roman Tolchenov
- Status changed from verifying to closed
Merge pull request #518 from mantidproject/feature/10854_rewrite_indirect_et_reduction
Rewrite ISIS indirect energy transfer reduction
Full changeset: a77c3846a562f6203c4d712e22fd41cd1792debc
comment:108 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 11696
