Merge branch 'master' into 11480_indirect_abs_cor_fixes
Conflicts: Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectTab.h Refs #11480
Showing
- Code/Mantid/Framework/API/inc/MantidAPI/BoxController.h 73 additions, 3 deletionsCode/Mantid/Framework/API/inc/MantidAPI/BoxController.h
- Code/Mantid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h 1 addition, 1 deletion...tid/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
- Code/Mantid/Framework/API/src/BoxController.cpp 53 additions, 2 deletionsCode/Mantid/Framework/API/src/BoxController.cpp
- Code/Mantid/Framework/API/test/BoxControllerTest.h 125 additions, 5 deletionsCode/Mantid/Framework/API/test/BoxControllerTest.h
- Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h 99 additions, 92 deletionsCode/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
- Code/Mantid/Framework/DataObjects/src/MDGridBox.cpp 25 additions, 4 deletionsCode/Mantid/Framework/DataObjects/src/MDGridBox.cpp
- Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h 20 additions, 0 deletions...tid/Framework/Geometry/inc/MantidGeometry/Crystal/Group.h
- Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h 8 additions, 3 deletions...ramework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
- Code/Mantid/Framework/Geometry/src/Crystal/CrystalStructure.cpp 4 additions, 0 deletions...antid/Framework/Geometry/src/Crystal/CrystalStructure.cpp
- Code/Mantid/Framework/Geometry/src/Crystal/Group.cpp 9 additions, 4 deletionsCode/Mantid/Framework/Geometry/src/Crystal/Group.cpp
- Code/Mantid/Framework/Geometry/src/Crystal/PointGroupFactory.cpp 4 additions, 1 deletion...ntid/Framework/Geometry/src/Crystal/PointGroupFactory.cpp
- Code/Mantid/Framework/Geometry/test/CrystalStructureTest.h 21 additions, 0 deletionsCode/Mantid/Framework/Geometry/test/CrystalStructureTest.h
- Code/Mantid/Framework/Geometry/test/GroupTest.h 37 additions, 0 deletionsCode/Mantid/Framework/Geometry/test/GroupTest.h
- Code/Mantid/Framework/Geometry/test/PointGroupFactoryTest.h 5 additions, 0 deletionsCode/Mantid/Framework/Geometry/test/PointGroupFactoryTest.h
- Code/Mantid/Framework/Geometry/test/PointGroupTest.h 5 additions, 2 deletionsCode/Mantid/Framework/Geometry/test/PointGroupTest.h
- Code/Mantid/Framework/Geometry/test/SpaceGroupTest.h 91 additions, 48 deletionsCode/Mantid/Framework/Geometry/test/SpaceGroupTest.h
- Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h 2 additions, 2 deletions...amework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
- Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h 3 additions, 2 deletions...k/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h
- Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp 18 additions, 32 deletionsCode/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
- Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp 22 additions, 7 deletionsCode/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
Loading
Please register or sign in to comment