Ticket #11035 (closed: fixed)
Remove CurveFitting dependency from SINQ
| Reported by: | Michael Wedel | Owned by: | Michael Wedel |
|---|---|---|---|
| Priority: | major | Milestone: | Release 3.4 |
| Component: | Diffraction | Keywords: | POLDI |
| Cc: | Blocked By: | ||
| Blocking: | Tester: | Martyn Gigg |
Description
In ticket #10774 the POLDI constant background function was changed to inherit from CurveFitting::FlatBackground. This causes problems on Mac OS, so I'm going to revert this dependency.
Change History
comment:2 Changed 6 years ago by Michael Wedel
- Status changed from new to verify
- Resolution set to fixed
This is being verified as pull request #184.
comment:3 Changed 6 years ago by Michael Wedel
Testing information Since this seems to be a Mac-problem, it would be best if someone on that system tested this ticket. A good test is running the system tests, which failed before, but should work with the dependency removed.
comment:4 Changed 6 years ago by Martyn Gigg
- Status changed from verify to verifying
- Tester set to Martyn Gigg
comment:5 Changed 6 years ago by Martyn Gigg
I am a little confused as to why the pull request shows so many commits to be merged. When I try locally it only merges one commit, which is what I expect. I am building a package to test the changes but I'm pretty sure they will be okay as the dependency has been removed at the CMake level.
comment:6 Changed 6 years ago by Michael Wedel
This might have something todo with master accidentally being force-pushed yesterday and the following repair-works. Should I just merge master into the branch again?
comment:7 Changed 6 years ago by Martyn Gigg
Yes I think you are right, I hadn't seen the slack messages. You don't need to merge master, the reset has taken it back to where it should be and all of the other commits mentioned here are already on master so merging this branch will actually only merge your changes.
The system tests look good now so I think this is okay.
comment:8 Changed 6 years ago by Martyn Gigg
Merge pull request #184 from mantidproject/11035_remove_curvefitting_dependency_from_sinq
Refs #11035. Remove CurveFitting dependency from SINQ
Changeset: 66403423a5bcef9d677e790a09189377479a6737
comment:9 Changed 6 years ago by Martyn Gigg
- Status changed from verifying to closed
Merge pull request #184 from mantidproject/11035_remove_curvefitting_dependency_from_sinq
Refs #11035. Remove CurveFitting dependency from SINQ
Full changeset: 66403423a5bcef9d677e790a09189377479a6737
comment:10 Changed 5 years ago by Stuart Campbell
This ticket has been transferred to github issue 11874
Refs #11035. Remove CurveFitting dependency from SINQ
Refactored PoldiSpectrumConstantBackground to have FlatBackground as a class member instead of inheriting from it.
Changeset: 5a48e0ca006a3a241fd6c0feb4aad58d21cea940