Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-v3.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Sep 28, 2017
2 parents f6d09cd + 176b413 commit a68a1d2
Show file tree
Hide file tree
Showing 52 changed files with 2,314 additions and 695 deletions.
21 changes: 12 additions & 9 deletions Framework/Algorithms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set ( SRC_FILES
src/CalculateEfficiency.cpp
src/CalculateFlatBackground.cpp
src/CalculateMuonAsymmetry.cpp
src/NRCalculateSlitResolution.cpp
src/CalculatePolynomialBackground.cpp
src/CalculateSlits.cpp
src/CalculateTransmission.cpp
src/CalculateTransmissionBeamSpreader.cpp
Expand All @@ -46,7 +46,7 @@ set ( SRC_FILES
src/Comment.cpp
src/CommutativeBinaryOperation.cpp
src/CompareWorkspaces.cpp
src/ConjoinXRuns.cpp
src/ConjoinXRuns.cpp
src/ConjoinWorkspaces.cpp
src/ConvertAxesToRealSpace.cpp
src/ConvertAxisByFormula.cpp
Expand Down Expand Up @@ -165,7 +165,7 @@ set ( SRC_FILES
src/Integration.cpp
src/InterpolatingRebin.cpp
src/InterpolationOption.cpp
src/InvertMask.cpp
src/InvertMask.cpp
src/LineProfile.cpp
src/Logarithm.cpp
src/LorentzCorrection.cpp
Expand Down Expand Up @@ -200,6 +200,7 @@ set ( SRC_FILES
src/NormaliseByDetector.cpp
src/NormaliseToMonitor.cpp
src/NormaliseToUnity.cpp
src/NRCalculateSlitResolution.cpp
src/OneMinusExponentialCor.cpp
src/PDCalibration.cpp
src/PDDetermineCharacterizations.cpp
Expand Down Expand Up @@ -351,7 +352,7 @@ set ( INC_FILES
inc/MantidAlgorithms/CalculateEfficiency.h
inc/MantidAlgorithms/CalculateFlatBackground.h
inc/MantidAlgorithms/CalculateMuonAsymmetry.h
inc/MantidAlgorithms/NRCalculateSlitResolution.h
inc/MantidAlgorithms/CalculatePolynomialBackground.h
inc/MantidAlgorithms/CalculateSlits.h
inc/MantidAlgorithms/CalculateTransmission.h
inc/MantidAlgorithms/CalculateTransmissionBeamSpreader.h
Expand All @@ -371,7 +372,7 @@ set ( INC_FILES
inc/MantidAlgorithms/CommutativeBinaryOperation.h
inc/MantidAlgorithms/CompareWorkspaces.h
inc/MantidAlgorithms/ConjoinWorkspaces.h
inc/MantidAlgorithms/ConjoinXRuns.h
inc/MantidAlgorithms/ConjoinXRuns.h
inc/MantidAlgorithms/ConvertAxesToRealSpace.h
inc/MantidAlgorithms/ConvertAxisByFormula.h
inc/MantidAlgorithms/ConvertDiffCal.h
Expand Down Expand Up @@ -490,7 +491,7 @@ set ( INC_FILES
inc/MantidAlgorithms/Integration.h
inc/MantidAlgorithms/InterpolatingRebin.h
inc/MantidAlgorithms/InterpolationOption.h
inc/MantidAlgorithms/InvertMask.h
inc/MantidAlgorithms/InvertMask.h
inc/MantidAlgorithms/LineProfile.h
inc/MantidAlgorithms/Logarithm.h
inc/MantidAlgorithms/LorentzCorrection.h
Expand Down Expand Up @@ -528,6 +529,7 @@ set ( INC_FILES
inc/MantidAlgorithms/NormaliseByDetector.h
inc/MantidAlgorithms/NormaliseToMonitor.h
inc/MantidAlgorithms/NormaliseToUnity.h
inc/MantidAlgorithms/NRCalculateSlitResolution.h
inc/MantidAlgorithms/OneMinusExponentialCor.h
inc/MantidAlgorithms/PaddingAndApodization.h
inc/MantidAlgorithms/PDCalibration.h
Expand Down Expand Up @@ -690,7 +692,7 @@ set ( TEST_FILES
CalculateEfficiencyTest.h
CalculateFlatBackgroundTest.h
CalculateMuonAsymmetryTest.h
NRCalculateSlitResolutionTest.h
CalculatePolynomialBackgroundTest.h
CalculateSlitsTest.h
CalculateTransmissionBeamSpreaderTest.h
CalculateTransmissionTest.h
Expand All @@ -711,7 +713,7 @@ set ( TEST_FILES
CommutativeBinaryOperationTest.h
CompareWorkspacesTest.h
ConjoinWorkspacesTest.h
ConjoinXRunsTest.h
ConjoinXRunsTest.h
ConvertAxesToRealSpaceTest.h
ConvertAxisByFormulaTest.h
ConvertDiffCalTest.h
Expand Down Expand Up @@ -824,7 +826,7 @@ set ( TEST_FILES
IntegrationTest.h
InterpolatingRebinTest.h
InterpolationOptionTest.h
InvertMaskTest.h
InvertMaskTest.h
LineProfileTest.h
LogarithmTest.h
LorentzCorrectionTest.h
Expand Down Expand Up @@ -858,6 +860,7 @@ set ( TEST_FILES
NormaliseByCurrentTest.h
NormaliseByDetectorTest.h
NormaliseToMonitorTest.h
NRCalculateSlitResolutionTest.h
OneMinusExponentialCorTest.h
PaddingAndApodizationTest.h
PDCalibrationTest.h
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#ifndef MANTID_ALGORITHMS_CALCULATEPOLYNOMIALBACKGROUND_H_
#define MANTID_ALGORITHMS_CALCULATEPOLYNOMIALBACKGROUND_H_

#include "MantidAlgorithms/DllConfig.h"
#include "MantidAPI/Algorithm.h"

namespace Mantid {
namespace Algorithms {

/** CalculatePolynomialBackground : This algorithm fits a polynomial
background to an input workspace and returns the evaluated background as
the output workspace.
Copyright © 2017 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
This file is part of Mantid.
Mantid is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
Mantid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class MANTID_ALGORITHMS_DLL CalculatePolynomialBackground
: public API::Algorithm {
public:
const std::string name() const override;
int version() const override;
const std::string category() const override;
const std::string summary() const override;

private:
void init() override;
void exec() override;
};

} // namespace Algorithms
} // namespace Mantid

#endif /* MANTID_ALGORITHMS_CALCULATEPOLYNOMIALBACKGROUND_H_ */
Loading

0 comments on commit a68a1d2

Please sign in to comment.