Merge branch 'master' into 10903_ida_abs_corr_tab (2c003ffa) · Commits · mantidproject / mantid

Commit 2c003ffa authored 10 years ago by Dan Nixon

Merge branch 'master' into 10903_ida_abs_corr_tab

Refs #10903

[ci skip]

parents b9e87e27 ffb7163d

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec 2 additions, 2 deletions

...d/dev-packages/rpm/mantid-developer/mantid-developer.spec
Code/Mantid/Framework/API/CMakeLists.txt 3 additions, 0 deletions

Code/Mantid/Framework/API/CMakeLists.txt
Code/Mantid/Framework/API/inc/MantidAPI/IFuncMinimizer.h 4 additions, 0 deletions

Code/Mantid/Framework/API/inc/MantidAPI/IFuncMinimizer.h
Code/Mantid/Framework/API/inc/MantidAPI/IRemoteJobManager.h 1 addition, 1 deletion

Code/Mantid/Framework/API/inc/MantidAPI/IRemoteJobManager.h
Code/Mantid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h 124 additions, 0 deletions

...tid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp 88 additions, 0 deletions

Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp
Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h 149 additions, 0 deletions

Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
Code/Mantid/Framework/Algorithms/src/Stitch1DMany.cpp 4 additions, 4 deletions

Code/Mantid/Framework/Algorithms/src/Stitch1DMany.cpp
Code/Mantid/Framework/Algorithms/test/PolarizationCorrectionTest.h 1 addition, 0 deletions

...id/Framework/Algorithms/test/PolarizationCorrectionTest.h
Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp 1 addition, 1 deletion

Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp
Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FABADAMinimizer.h 4 additions, 3 deletions

...ork/CurveFitting/inc/MantidCurveFitting/FABADAMinimizer.h
Code/Mantid/Framework/CurveFitting/src/DynamicKuboToyabe.cpp 164 additions, 21 deletions

Code/Mantid/Framework/CurveFitting/src/DynamicKuboToyabe.cpp
Code/Mantid/Framework/CurveFitting/src/FABADAMinimizer.cpp 334 additions, 250 deletions

Code/Mantid/Framework/CurveFitting/src/FABADAMinimizer.cpp
Code/Mantid/Framework/CurveFitting/src/Fit.cpp 2 additions, 0 deletions

Code/Mantid/Framework/CurveFitting/src/Fit.cpp
Code/Mantid/Framework/CurveFitting/test/DynamicKuboToyabeTest.h 6 additions, 6 deletions

...antid/Framework/CurveFitting/test/DynamicKuboToyabeTest.h
Code/Mantid/Framework/CurveFitting/test/FABADAMinimizerTest.h 104 additions, 109 deletions

.../Mantid/Framework/CurveFitting/test/FABADAMinimizerTest.h
Code/Mantid/Framework/CurveFitting/test/FunctionParameterDecoratorFitTest.h 1 addition, 1 deletion

...ork/CurveFitting/test/FunctionParameterDecoratorFitTest.h
Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h 2 additions, 1 deletion

...work/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp 4 additions, 2 deletions

Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp
Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp 14 additions, 6 deletions

Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp

with 1012 additions and 407 deletions

Please register or to comment