Merge remote-tracking branch 'origin/master' into save_instrument_geometry
Showing
- CMakeLists.txt 27 additions, 37 deletionsCMakeLists.txt
- Framework/API/src/FrameworkManager.cpp 4 additions, 4 deletionsFramework/API/src/FrameworkManager.cpp
- Framework/API/test/MultiDomainFunctionTest.h 2 additions, 2 deletionsFramework/API/test/MultiDomainFunctionTest.h
- Framework/Algorithms/test/RebinByTimeAtSampleTest.h 7 additions, 7 deletionsFramework/Algorithms/test/RebinByTimeAtSampleTest.h
- Framework/CMakeLists.txt 4 additions, 5 deletionsFramework/CMakeLists.txt
- Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h 3 additions, 3 deletions...k/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
- Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h 2 additions, 2 deletions...itting/inc/MantidCurveFitting/Functions/BivariateNormal.h
- Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h 2 additions, 3 deletions...ing/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
- Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h 2 additions, 3 deletions...Fitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
- Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h 0 additions, 2 deletions...CurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
- Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h 2 additions, 3 deletions...ting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
- Framework/CurveFitting/test/Algorithms/SeqDomainSpectrumCreatorTest.h 4 additions, 5 deletions...rveFitting/test/Algorithms/SeqDomainSpectrumCreatorTest.h
- Framework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h 26 additions, 24 deletionsFramework/CurveFitting/test/Functions/IkedaCarpenterPVTest.h
- Framework/CurveFitting/test/MultiDomainFunctionTest.h 2 additions, 2 deletionsFramework/CurveFitting/test/MultiDomainFunctionTest.h
- Framework/DataHandling/src/SaveCanSAS1D2.cpp 1 addition, 1 deletionFramework/DataHandling/src/SaveCanSAS1D2.cpp
- Framework/DataObjects/CMakeLists.txt 1 addition, 0 deletionsFramework/DataObjects/CMakeLists.txt
- Framework/DataObjects/inc/MantidDataObjects/ReflectometryTransform.h 15 additions, 5 deletions...ataObjects/inc/MantidDataObjects/ReflectometryTransform.h
- Framework/DataObjects/src/ReflectometryTransform.cpp 75 additions, 83 deletionsFramework/DataObjects/src/ReflectometryTransform.cpp
- Framework/DataObjects/test/NoShapeTest.h 6 additions, 1 deletionFramework/DataObjects/test/NoShapeTest.h
- Framework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h 6 additions, 1 deletionFramework/DataObjects/test/PeakShapeEllipsoidFactoryTest.h
Loading
Please register or sign in to comment