Ticket #9964 (closed: fixed)
Apply Corrections bugs.
Reported by: | Samuel Jackson | Owned by: | Dan Nixon |
---|---|---|---|
Priority: | major | Milestone: | Release 3.3 |
Component: | Indirect Inelastic | Keywords: | |
Cc: | spencer.howells@… | Blocked By: | |
Blocking: | #9344, #10094 | Tester: | Martyn Gigg |
Description
From Spencer:
NameError: global name 'sam_name' is not defined at line 18 in '<Interface>' caused by line 982 in 'C:/MantidInstall/scripts/Inelastic\IndirectDataAnalysis.py' caused by line 871 in 'C:/MantidInstall/scripts/Inelastic\IndirectDataAnalysis.py'
Change History
comment:2 Changed 6 years ago by Samuel Jackson
Refs #9964 Fix a couple of bugs in Apply Corrections.
Changeset: fdd4e9e88ab6f24d26c4e690248068e0923e3279
comment:3 Changed 6 years ago by Samuel Jackson
Refs #9964 Add unit test suite for Apply Corrections.
This should be moved to algorithm tests when apply corr becomes and algorithm.
Changeset: 070400c9dce43e8673b11a0c6044daaa409b76dd
comment:4 Changed 6 years ago by Samuel Jackson
Refs #9964 Refactor test.
Changeset: b415e82b74d8391806f052cf432e7eac2005d63b
comment:5 Changed 6 years ago by Samuel Jackson
Refs #9964 Add some system tests for Apply Corrections.
Changeset: 028f5f3c199106cd4438bce8c0da98aa3c2d8ee6
comment:7 Changed 6 years ago by Samuel Jackson
- Status changed from assigned to verify
- Resolution set to fixed
To Test
- Check the new unit tests from ApplyCorrections are passing on the build servers
- Check the new system tests from ApplyCorrections are passing on the build servers
- Run apply corrections with:
- Just a can workspace
- A corrections workspace using just the sample (generated from calculate corrections)
- A corrections workspace using the sample and can (generated from calculate corrections)
- Both the can and corrections workspace
Instructions for running both and example data files found in the system tests can be found at: http://www.mantidproject.org/Indirect:Indirect_Data_Analysis#Running_Apply_Corrections
comment:8 Changed 6 years ago by Martyn Gigg
- Status changed from verify to verifying
- Tester set to Martyn Gigg
comment:9 Changed 6 years ago by Martyn Gigg
- Status changed from verifying to verify
- Tester Martyn Gigg deleted
Looks like I can't verify this one as the calculate corrections part only runs on windows
comment:11 Changed 6 years ago by Samuel Jackson
Refs #9964 Temporary fix for the develop build
Changeset: b6ca819fd03bbd2726f32db532d1975598aa9bbc
comment:12 Changed 6 years ago by Samuel Jackson
Merge branch 'feature/9964_apply_correction_bug' into develop
Refs #9964
Conflicts:
Code/Mantid/scripts/CMakeLists.txt
Changeset: 57c2d37369224b78eea53eb2dd19da60ee9a49ee
comment:13 Changed 6 years ago by Samuel Jackson
- Status changed from verify to reopened
- Resolution fixed deleted
comment:15 Changed 6 years ago by Dan Nixon
- Status changed from reopened to inprogress
Force Git to see a new version of this file
Refs #9964
Changeset: 7bb7e221d7d644f9286ab19d06d751e2f0ea66a8
comment:16 Changed 6 years ago by Dan Nixon
Merge branch 'feature/9964_apply_correction_bug' into develop
Fix failing unit test
Conflicts:
Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Refs #9964
Changeset: e33cde528628c7e12daff47019aa3e765dc0f0a2
comment:17 Changed 6 years ago by Dan Nixon
comment:18 Changed 6 years ago by Dan Nixon
- Status changed from inprogress to verify
- Resolution set to fixed
comment:19 Changed 6 years ago by Samuel Jackson
Refs #9964 Temporary fix for the develop build
Changeset: b6ca819fd03bbd2726f32db532d1975598aa9bbc
comment:20 Changed 6 years ago by Samuel Jackson
Merge branch 'feature/9964_apply_correction_bug' into develop
Refs #9964
Conflicts:
Code/Mantid/scripts/CMakeLists.txt
Changeset: 57c2d37369224b78eea53eb2dd19da60ee9a49ee
comment:21 Changed 6 years ago by Dan Nixon
Merge branch 'feature/9964_apply_correction_bug' into develop
Fix failing unit test
Conflicts:
Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Refs #9964
Changeset: e33cde528628c7e12daff47019aa3e765dc0f0a2
comment:22 Changed 6 years ago by Roman Tolchenov
- Status changed from verify to verifying
- Tester set to Roman Tolchenov
comment:23 Changed 6 years ago by Roman Tolchenov
- Status changed from verifying to reopened
- Resolution fixed deleted
Testes on win7. Applying correction with just a can workspace worked. Was unable to test the other options because Calculate Correction kept failing with the message:
TypeError: AbsRunFeeder() got an unexpected keyword argument 'Save' at line 18 in '<Interface>'
comment:24 Changed 6 years ago by Dan Nixon
- Status changed from reopened to inprogress
comment:25 Changed 6 years ago by Dan Nixon
Merge branch 'feature/9964_apply_correction_bug' into develop
Conflicts:
Code/Mantid/scripts/Inelastic/IndirectAbsCor.py
Refs #9964
Changeset: 5326db9f23fb2ec34dc5eec1d12c054b8f1f5cba
comment:26 Changed 6 years ago by Dan Nixon
- Status changed from inprogress to verify
- Resolution set to fixed
comment:28 Changed 6 years ago by Roman Tolchenov
- Status changed from verifying to reopened
- Resolution fixed deleted
Running Apply Corrections with the correction workspace only gives error:
ValueError: Invalid value for property InputWorkspace (MatrixWorkspace) "__apply_corr_scaled_container": Workspace "__apply_corr_scaled_container" was not found in the Analysis Data Service at line 18 in '<Interface>' caused by line 981 in 'C:/MantidInstall/scripts/Inelastic\IndirectDataAnalysis.py' caused by line 895 in 'C:/MantidInstall/scripts/Inelastic\IndirectDataAnalysis.py' caused by line 568 in 'C:/MantidInstall/bin\mantid\simpleapi.py' caused by line 532 in 'C:/MantidInstall/bin\mantid\simpleapi.py'
comment:29 Changed 6 years ago by Dan Nixon
- Status changed from reopened to inprogress
Only apply can corrections if we have a can workspace
Refs #9964
Changeset: 91b602fd98c1d67907cd773bd6cd2c013e46240e
comment:30 Changed 6 years ago by Dan Nixon
Added system test for correction WS and no can
Refs #9964
Changeset: ce25403596e2618092314e98541c390dfe23a47c
comment:31 Changed 6 years ago by Dan Nixon
- Status changed from inprogress to verify
- Resolution set to fixed
comment:33 Changed 6 years ago by Dan Nixon
comment:34 Changed 6 years ago by Dan Nixon
Merge branch 'feature/9964_apply_correction_bug' into develop
Conflicts:
Code/Mantid/scripts/CMakeLists.txt
Refs #9964
Changeset: b4fce90cd082f15ddb2ecc9c453577ed48545990
comment:35 Changed 6 years ago by Dan Nixon
- Status changed from verify to reopened
- Resolution fixed deleted
comment:36 Changed 6 years ago by Dan Nixon
- Status changed from reopened to inprogress
Revert "Disable failing test"
This reverts commit b32569c684f5f909896acef7eade0140e23210b3.
Refs #9964
Changeset: bf2e3412eeb54bdd94c1203f972a6c6bd86ce516
comment:37 Changed 6 years ago by Dan Nixon
Merge branch 'feature/9964_apply_correction_bug' into develop
Conflicts:
Code/Mantid/scripts/CMakeLists.txt
Refs #9964
Changeset: 2229a24672ca880c95d46c87fea22de5da1ecbe8
comment:38 Changed 6 years ago by Dan Nixon
- Status changed from inprogress to verify
- Resolution set to fixed
comment:39 Changed 6 years ago by Martyn Gigg
- Status changed from verify to verifying
- Tester changed from Roman Tolchenov to Martyn Gigg
comment:40 Changed 6 years ago by Martyn Gigg
- Status changed from verifying to reopened
- Resolution fixed deleted
There are some non-trivial merge conflicts that could do with resolving. Could you merge master into the branch and then re-close the ticket.
comment:41 Changed 6 years ago by Dan Nixon
- Status changed from reopened to inprogress
Merge branch 'master' into feature/9964_apply_correction_bug
Conflicts:
Code/Mantid/scripts/CMakeLists.txt Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Refs #9964
Changeset: 79f833ad0ee0aae0a2c92737088f55b82819223c
comment:42 Changed 6 years ago by Dan Nixon
Merge branch 'feature/9964_apply_correction_bug' into develop
Conflicts:
Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Refs #9964
Changeset: 6ae98fb4b81456d1d5803671c55846eb02c94d76
comment:43 Changed 6 years ago by Dan Nixon
- Status changed from inprogress to verify
- Resolution set to fixed
comment:45 Changed 6 years ago by Dan Nixon
- Status changed from verifying to closed
Merge branch 'master' into feature/9964_apply_correction_bug
Conflicts:
Code/Mantid/scripts/CMakeLists.txt Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Refs #9964
Full changeset: 79f833ad0ee0aae0a2c92737088f55b82819223c
comment:46 Changed 6 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/9964_apply_correction_bug'
Full changeset: 2764c21ddcdf5761eb8e6404d97741ca18935474
comment:47 Changed 6 years ago by Martyn Gigg
Merge remote-tracking branch 'origin/feature/9964_apply_corrections_bug'
Conflicts:
SystemTests/AnalysisTests/ISISIndirectInelastic.py
Full changeset: 3e7d8780e9df7c2d0139338551737e740882d01e
comment:48 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 10806