Merge release-next into ornl-next

mantidproject · Oct 1, 2024 · bfe5f45 · bfe5f45
2 parents 0042a73 + a931470
commit bfe5f45
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 489 deletions.
diff --git a/Framework/Crystal/CMakeLists.txt b/Framework/Crystal/CMakeLists.txt
@@ -72,7 +72,6 @@ set(SRC_FILES
     src/SortPeaksWorkspace.cpp
     src/StatisticsOfPeaksWorkspace.cpp
     src/TransformHKL.cpp
-    src/RotateSampleShape.cpp
 )
 
 set(INC_FILES
@@ -152,7 +151,6 @@ set(INC_FILES
     inc/MantidCrystal/SortPeaksWorkspace.h
     inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
     inc/MantidCrystal/TransformHKL.h
-    inc/MantidCrystal/RotateSampleShape.h
 )
 
 set(TEST_FILES
@@ -225,7 +223,6 @@ set(TEST_FILES
     SortPeaksWorkspaceTest.h
     StatisticsOfPeaksWorkspaceTest.h
     TransformHKLTest.h
-    RotateSampleShapeTest.h
 )
 
 if(COVERAGE)
@@ -261,7 +258,7 @@ include_directories(inc)
 target_link_libraries(
   Crystal
   PUBLIC Mantid::API Mantid::Geometry Mantid::Kernel
-  PRIVATE Mantid::DataObjects Mantid::Indexing Mantid::DataHandling
+  PRIVATE Mantid::DataObjects Mantid::Indexing
 )
 
 # Add the unit tests directory

diff --git a/Framework/Crystal/inc/MantidCrystal/RotateSampleShape.h b/Framework/Crystal/inc/MantidCrystal/RotateSampleShape.h
diff --git a/Framework/Crystal/src/RotateSampleShape.cpp b/Framework/Crystal/src/RotateSampleShape.cpp