fix merge conflict with fitting reorganization, re #13918 (68ea2928) · Commits · mantidproject / mantid

Commit 68ea2928 authored 9 years ago by Federico Montesino Pouzols

Browse files

fix merge conflict with fitting reorganization, re #13918

parents fe3bdf8d 4e24cdfc

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
Framework/API/inc/MantidAPI/IFunction1D.h 3 additions, 2 deletions

Framework/API/inc/MantidAPI/IFunction1D.h
Framework/CurveFitting/CMakeLists.txt 286 additions, 283 deletions

Framework/CurveFitting/CMakeLists.txt
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h 2 additions, 0 deletions

...g/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h 15 additions, 11 deletions

.../MantidCurveFitting/Algorithms/CalculateGammaBackground.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h 11 additions, 8 deletions

...ng/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h 2 additions, 0 deletions

...tting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h 3 additions, 1 deletion

...ng/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h 2 additions, 0 deletions

...ng/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h 2 additions, 0 deletions

...ting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h 2 additions, 0 deletions

...work/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h 2 additions, 0 deletions

...rk/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h 71 additions, 61 deletions

...ng/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h 9 additions, 8 deletions

...urveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h 6 additions, 2 deletions

...itting/inc/MantidCurveFitting/Algorithms/LeBailFunction.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h 2 additions, 0 deletions

...g/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h 8 additions, 6 deletions

...urveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h 2 additions, 0 deletions

...ng/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h 8 additions, 6 deletions

...urveFitting/Algorithms/RefinePowderInstrumentParameters.h
Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h 6 additions, 4 deletions

...rveFitting/Algorithms/RefinePowderInstrumentParameters3.h

with 443 additions and 393 deletions

Please register or to comment