Merge branch 'master' into feature/10854_rewrite_indirect_et_reduction
Conflicts: Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py Refs #10854
Showing
- Code/Mantid/Framework/Algorithms/src/AddSampleLog.cpp 9 additions, 7 deletionsCode/Mantid/Framework/Algorithms/src/AddSampleLog.cpp
- Code/Mantid/Framework/Crystal/CMakeLists.txt 3 additions, 0 deletionsCode/Mantid/Framework/Crystal/CMakeLists.txt
- Code/Mantid/Framework/Crystal/inc/MantidCrystal/StatisticsOfPeaksWorkspace.h 52 additions, 0 deletions...rk/Crystal/inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
- Code/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp 12 additions, 7 deletionsCode/Mantid/Framework/Crystal/src/LoadIsawPeaks.cpp
- Code/Mantid/Framework/Crystal/src/PredictPeaks.cpp 146 additions, 120 deletionsCode/Mantid/Framework/Crystal/src/PredictPeaks.cpp
- Code/Mantid/Framework/Crystal/src/SaveHKL.cpp 83 additions, 55 deletionsCode/Mantid/Framework/Crystal/src/SaveHKL.cpp
- Code/Mantid/Framework/Crystal/src/SortHKL.cpp 128 additions, 22 deletionsCode/Mantid/Framework/Crystal/src/SortHKL.cpp
- Code/Mantid/Framework/Crystal/src/StatisticsOfPeaksWorkspace.cpp 180 additions, 0 deletions...ntid/Framework/Crystal/src/StatisticsOfPeaksWorkspace.cpp
- Code/Mantid/Framework/Crystal/src/TOFExtinction.cpp 20 additions, 14 deletionsCode/Mantid/Framework/Crystal/src/TOFExtinction.cpp
- Code/Mantid/Framework/Crystal/test/SortHKLTest.h 10 additions, 3 deletionsCode/Mantid/Framework/Crystal/test/SortHKLTest.h
- Code/Mantid/Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h 119 additions, 0 deletions...d/Framework/Crystal/test/StatisticsOfPeaksWorkspaceTest.h
- Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp 24 additions, 22 deletionsCode/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
- Code/Mantid/Framework/Kernel/inc/MantidKernel/InternetHelper.h 1 addition, 0 deletions...Mantid/Framework/Kernel/inc/MantidKernel/InternetHelper.h
- Code/Mantid/Framework/Kernel/src/InternetHelper.cpp 18 additions, 6 deletionsCode/Mantid/Framework/Kernel/src/InternetHelper.cpp
- Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt 4 additions, 1 deletionCode/Mantid/Framework/MDAlgorithms/CMakeLists.txt
- Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h 7 additions, 2 deletions...lgorithms/inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h
- Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h 10 additions, 0 deletions...thms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
- Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GetSpiceDataRawCountsFromMD.h 116 additions, 0 deletions...thms/inc/MantidMDAlgorithms/GetSpiceDataRawCountsFromMD.h
- Code/Mantid/Framework/MDAlgorithms/src/ConvertCWPDMDToSpectra.cpp 38 additions, 5 deletions...tid/Framework/MDAlgorithms/src/ConvertCWPDMDToSpectra.cpp
- Code/Mantid/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp 74 additions, 0 deletions...ramework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
Loading
Please register or sign in to comment