From 31a90376dcda7439ecba3539e0a480fc68a98fc1 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Thu, 25 Oct 2012 17:32:24 +0100
Subject: [PATCH] refs #5955 Moved CreateMDWorkspace and CreateMDHistoWorkspace
---
Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt | 6 ++++++
.../inc/MantidMDAlgorithms}/CreateMDHistoWorkspace.h | 4 ++--
.../inc/MantidMDAlgorithms}/CreateMDWorkspace.h | 4 ++--
.../src/CreateMDHistoWorkspace.cpp | 4 ++--
.../{MDEvents => MDAlgorithms}/src/CreateMDWorkspace.cpp | 4 ++--
Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h | 2 ++
.../test/CreateMDHistoWorkspaceTest.h | 2 +-
.../{MDEvents => MDAlgorithms}/test/CreateMDWorkspaceTest.h | 2 +-
Code/Mantid/Framework/MDEvents/CMakeLists.txt | 6 ------
9 files changed, 18 insertions(+), 16 deletions(-)
rename Code/Mantid/Framework/{MDEvents/inc/MantidMDEvents => MDAlgorithms/inc/MantidMDAlgorithms}/CreateMDHistoWorkspace.h (93%)
rename Code/Mantid/Framework/{MDEvents/inc/MantidMDEvents => MDAlgorithms/inc/MantidMDAlgorithms}/CreateMDWorkspace.h (92%)
rename Code/Mantid/Framework/{MDEvents => MDAlgorithms}/src/CreateMDHistoWorkspace.cpp (98%)
rename Code/Mantid/Framework/{MDEvents => MDAlgorithms}/src/CreateMDWorkspace.cpp (99%)
rename Code/Mantid/Framework/{MDEvents => MDAlgorithms}/test/CreateMDHistoWorkspaceTest.h (99%)
rename Code/Mantid/Framework/{MDEvents => MDAlgorithms}/test/CreateMDWorkspaceTest.h (99%)
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
index e5ebea75c14..083db4ce6e9 100644
--- a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -11,6 +11,8 @@ set ( SRC_FILES
src/CompareMDWorkspaces.cpp
src/ConvertToDetectorFaceMD.cpp
src/ConvertToMD.cpp
+ src/CreateMDHistoWorkspace.cpp
+ src/CreateMDWorkspace.cpp
src/DampedHisenbergFMSW.cpp
src/DivideMD.cpp
src/EqualToMD.cpp
@@ -87,6 +89,8 @@ set ( INC_FILES
inc/MantidMDAlgorithms/CompareMDWorkspaces.h
inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
inc/MantidMDAlgorithms/ConvertToMD.h
+ inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
+ inc/MantidMDAlgorithms/CreateMDWorkspace.h
inc/MantidMDAlgorithms/DampedHisenbergFMSW.h
inc/MantidMDAlgorithms/DivideMD.h
inc/MantidMDAlgorithms/DllConfig.h
@@ -178,6 +182,8 @@ set ( TEST_FILES
ConvertToMDComponentsTest.h
ConvertToMDTest.h
ConvertToQ3DdETest.h
+ CreateMDHistoWorkspaceTest.h
+ CreateMDWorkspaceTest.h
DampedHisenbergFMSWTest.h
DivideMDTest.h
EqualToMDTest.h
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDHistoWorkspace.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
similarity index 93%
rename from Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDHistoWorkspace.h
rename to Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
index e9e0afdcf62..930830c0d0b 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDHistoWorkspace.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
@@ -6,7 +6,7 @@
namespace Mantid
{
-namespace MDEvents
+namespace MDAlgorithms
{
/** CreateMDHistoWorkspace : TODO: DESCRIPTION
@@ -33,7 +33,7 @@ namespace MDEvents
File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
- class DLLExport CreateMDHistoWorkspace : public ImportMDHistoWorkspaceBase
+ class DLLExport CreateMDHistoWorkspace : public MDEvents::ImportMDHistoWorkspaceBase
{
public:
CreateMDHistoWorkspace();
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDWorkspace.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
similarity index 92%
rename from Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDWorkspace.h
rename to Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
index e7df19b6fb9..3561ae64b0d 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/CreateMDWorkspace.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
@@ -9,7 +9,7 @@
namespace Mantid
{
-namespace MDEvents
+namespace MDAlgorithms
{
/** CreateMDWorkspace :
@@ -20,7 +20,7 @@ namespace MDEvents
* @author Janik Zikovsky
* @date 2011-02-25 11:54:52.003137
*/
- class DLLExport CreateMDWorkspace : public BoxControllerSettingsAlgorithm
+ class DLLExport CreateMDWorkspace : public MDEvents::BoxControllerSettingsAlgorithm
{
public:
CreateMDWorkspace();
diff --git a/Code/Mantid/Framework/MDEvents/src/CreateMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
similarity index 98%
rename from Code/Mantid/Framework/MDEvents/src/CreateMDHistoWorkspace.cpp
rename to Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
index e9cae4bc0c4..0209f202a2c 100644
--- a/Code/Mantid/Framework/MDEvents/src/CreateMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
@@ -31,7 +31,7 @@ A very similar algorithm to this is [[ImportMDHistoWorkspace]], which takes it's
*WIKI*/
-#include "MantidMDEvents/CreateMDHistoWorkspace.h"
+#include "MantidMDAlgorithms/CreateMDHistoWorkspace.h"
#include "MantidKernel/ArrayProperty.h"
#include <algorithm>
@@ -40,7 +40,7 @@ using namespace Mantid::API;
namespace Mantid
{
-namespace MDEvents
+namespace MDAlgorithms
{
/**
Helper type to compute the square in-place.
diff --git a/Code/Mantid/Framework/MDEvents/src/CreateMDWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
similarity index 99%
rename from Code/Mantid/Framework/MDEvents/src/CreateMDWorkspace.cpp
rename to Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
index 1ea26c6b971..0766e761d73 100644
--- a/Code/Mantid/Framework/MDEvents/src/CreateMDWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
@@ -20,7 +20,7 @@ You can create a file-backed MDEventWorkspace by specifying the Filename and Mem
#include "MantidGeometry/MDGeometry/MDHistoDimension.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/System.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
+#include "MantidMDAlgorithms/CreateMDWorkspace.h"
#include "MantidMDEvents/MDEventFactory.h"
#include "MantidKernel/Memory.h"
#include <math.h>
@@ -29,7 +29,7 @@ You can create a file-backed MDEventWorkspace by specifying the Filename and Mem
namespace Mantid
{
-namespace MDEvents
+namespace MDAlgorithms
{
using namespace Mantid::Kernel;
using namespace Mantid::API;
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h
index b60338122f7..2c235c3aaf7 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h
@@ -225,6 +225,8 @@ public:
void testExecLagreRegularSignal()
{
+
+
FakeMDEventData FakeDat;
TS_ASSERT_THROWS_NOTHING( FakeDat.initialize() )
TS_ASSERT( FakeDat.isInitialized() )
diff --git a/Code/Mantid/Framework/MDEvents/test/CreateMDHistoWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
similarity index 99%
rename from Code/Mantid/Framework/MDEvents/test/CreateMDHistoWorkspaceTest.h
rename to Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
index 1fa76eecd51..18de101bd91 100644
--- a/Code/Mantid/Framework/MDEvents/test/CreateMDHistoWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
@@ -7,7 +7,7 @@
#include <iostream>
#include <iomanip>
-#include "MantidMDEvents/CreateMDHistoWorkspace.h"
+#include "MantidMDAlgorithms/CreateMDHistoWorkspace.h"
using namespace Mantid;
using namespace Mantid::MDEvents;
diff --git a/Code/Mantid/Framework/MDEvents/test/CreateMDWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
similarity index 99%
rename from Code/Mantid/Framework/MDEvents/test/CreateMDWorkspaceTest.h
rename to Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
index c8513f21862..b86a3931e28 100644
--- a/Code/Mantid/Framework/MDEvents/test/CreateMDWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
@@ -5,8 +5,8 @@
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
#include "MantidMDEvents/MDEventFactory.h"
+#include "MantidMDAlgorithms/CreateMDWorkspace.h"
#include "MantidAPI/FrameworkManager.h"
#include <cxxtest/TestSuite.h>
#include <iomanip>
diff --git a/Code/Mantid/Framework/MDEvents/CMakeLists.txt b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
index 0e528e47263..2ecf6f89ee0 100644
--- a/Code/Mantid/Framework/MDEvents/CMakeLists.txt
+++ b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
@@ -17,8 +17,6 @@ set ( SRC_FILES
src/CoordTransformAligned.cpp
src/CoordTransformDistance.cpp
src/CoordTransformDistanceParser.cpp
- src/CreateMDHistoWorkspace.cpp
- src/CreateMDWorkspace.cpp
src/FindPeaksMD.cpp
src/FitMD.cpp
src/ImportMDEventWorkspace.cpp
@@ -83,8 +81,6 @@ set ( INC_FILES
inc/MantidMDEvents/CoordTransformAligned.h
inc/MantidMDEvents/CoordTransformDistance.h
inc/MantidMDEvents/CoordTransformDistanceParser.h
- inc/MantidMDEvents/CreateMDHistoWorkspace.h
- inc/MantidMDEvents/CreateMDWorkspace.h
inc/MantidMDEvents/FindPeaksMD.h
inc/MantidMDEvents/FitMD.h
inc/MantidMDEvents/ImportMDEventWorkspace.h
@@ -144,8 +140,6 @@ set ( TEST_FILES
CoordTransformAlignedTest.h
CoordTransformDistanceParserTest.h
CoordTransformDistanceTest.h
- CreateMDHistoWorkspaceTest.h
- CreateMDWorkspaceTest.h
FindPeaksMDTest.h
FitMDTest.h
ImportMDEventWorkspaceTest.h
--
GitLab