Commit b2519752 authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Move the algorithms from MDEvents to MDAlgorithms.

Refs #11209
parent 0fd1c3dc
...@@ -125,7 +125,6 @@ if ( CXXTEST_FOUND ) ...@@ -125,7 +125,6 @@ if ( CXXTEST_FOUND )
endif () endif ()
add_subdirectory (MDAlgorithms) add_subdirectory (MDAlgorithms)
add_subdirectory (MDEvents)
add_subdirectory (Doxygen) add_subdirectory (Doxygen)
add_subdirectory (ScriptRepository) add_subdirectory (ScriptRepository)
add_subdirectory (ISISLiveData) add_subdirectory (ISISLiveData)
......
...@@ -7,11 +7,13 @@ set ( SRC_FILES ...@@ -7,11 +7,13 @@ set ( SRC_FILES
src/BinMD.cpp src/BinMD.cpp
src/BinaryOperationMD.cpp src/BinaryOperationMD.cpp
src/BooleanBinaryOperationMD.cpp src/BooleanBinaryOperationMD.cpp
src/BoxControllerSettingsAlgorithm.cpp
src/CalculateCoverageDGS.cpp src/CalculateCoverageDGS.cpp
src/CentroidPeaksMD.cpp src/CentroidPeaksMD.cpp
src/CentroidPeaksMD2.cpp src/CentroidPeaksMD2.cpp
src/CloneMDWorkspace.cpp src/CloneMDWorkspace.cpp
src/CompareMDWorkspaces.cpp src/CompareMDWorkspaces.cpp
src/ConvToMDBase.cpp
src/ConvertSpiceDataToRealSpace.cpp src/ConvertSpiceDataToRealSpace.cpp
src/ConvertToDetectorFaceMD.cpp src/ConvertToDetectorFaceMD.cpp
src/ConvertToDiffractionMDWorkspace.cpp src/ConvertToDiffractionMDWorkspace.cpp
...@@ -20,6 +22,7 @@ set ( SRC_FILES ...@@ -20,6 +22,7 @@ set ( SRC_FILES
src/ConvertToMDMinMaxGlobal.cpp src/ConvertToMDMinMaxGlobal.cpp
src/ConvertToMDMinMaxLocal.cpp src/ConvertToMDMinMaxLocal.cpp
src/ConvertToMDParent.cpp src/ConvertToMDParent.cpp
src/ConvertToReflectometryQ.cpp
src/CreateMDHistoWorkspace.cpp src/CreateMDHistoWorkspace.cpp
src/CreateMDWorkspace.cpp src/CreateMDWorkspace.cpp
src/DivideMD.cpp src/DivideMD.cpp
...@@ -28,8 +31,12 @@ set ( SRC_FILES ...@@ -28,8 +31,12 @@ set ( SRC_FILES
src/ExponentialMD.cpp src/ExponentialMD.cpp
src/FakeMDEventData.cpp src/FakeMDEventData.cpp
src/FindPeaksMD.cpp src/FindPeaksMD.cpp
src/FitMD.cpp
src/GreaterThanMD.cpp src/GreaterThanMD.cpp
src/IDynamicRebinning.cpp src/IDynamicRebinning.cpp
src/ImportMDEventWorkspace.cpp
src/ImportMDHistoWorkspace.cpp
src/Integrate3DEvents.cpp
src/IntegrateFlux.cpp src/IntegrateFlux.cpp
src/IntegratePeaksMD.cpp src/IntegratePeaksMD.cpp
src/IntegratePeaksMD2.cpp src/IntegratePeaksMD2.cpp
...@@ -41,14 +48,21 @@ set ( SRC_FILES ...@@ -41,14 +48,21 @@ set ( SRC_FILES
src/LoadMD.cpp src/LoadMD.cpp
src/LoadSQW.cpp src/LoadSQW.cpp
src/LogarithmMD.cpp src/LogarithmMD.cpp
src/MDEventWSWrapper.cpp
src/MDNormDirectSC.cpp src/MDNormDirectSC.cpp
src/MDNormSCD.cpp src/MDNormSCD.cpp
src/MDTransfAxisNames.cpp
src/MDTransfFactory.cpp
src/MDTransfModQ.cpp
src/MDTransfQ3D.cpp
src/MDWSDescription.cpp
src/MaskMD.cpp src/MaskMD.cpp
src/MergeMD.cpp src/MergeMD.cpp
src/MergeMDFiles.cpp src/MergeMDFiles.cpp
src/MinusMD.cpp src/MinusMD.cpp
src/MultiplyMD.cpp src/MultiplyMD.cpp
src/NotMD.cpp src/NotMD.cpp
src/OneStepMDEW.cpp
src/OrMD.cpp src/OrMD.cpp
src/PlusMD.cpp src/PlusMD.cpp
src/PowerMD.cpp src/PowerMD.cpp
...@@ -68,6 +82,11 @@ set ( SRC_FILES ...@@ -68,6 +82,11 @@ set ( SRC_FILES
src/Quantification/Resolution/TobyFitYVector.cpp src/Quantification/Resolution/TobyFitYVector.cpp
src/Quantification/ResolutionConvolvedCrossSection.cpp src/Quantification/ResolutionConvolvedCrossSection.cpp
src/Quantification/SimulateResolutionConvolvedModel.cpp src/Quantification/SimulateResolutionConvolvedModel.cpp
src/QueryMDWorkspace.cpp
src/ReflectometryTransformKiKf.cpp
src/ReflectometryTransformP.cpp
src/ReflectometryTransformQxQz.cpp
src/SaveIsawQvector.cpp
src/SaveMD.cpp src/SaveMD.cpp
src/SaveZODS.cpp src/SaveZODS.cpp
src/SetMDUsingMask.cpp src/SetMDUsingMask.cpp
...@@ -76,6 +95,7 @@ set ( SRC_FILES ...@@ -76,6 +95,7 @@ set ( SRC_FILES
src/ThresholdMD.cpp src/ThresholdMD.cpp
src/TransformMD.cpp src/TransformMD.cpp
src/UnaryOperationMD.cpp src/UnaryOperationMD.cpp
src/UnitsConversionHelper.cpp
src/Vector3DParameterParser.cpp src/Vector3DParameterParser.cpp
src/WeightedMeanMD.cpp src/WeightedMeanMD.cpp
src/XorMD.cpp src/XorMD.cpp
...@@ -90,11 +110,13 @@ set ( INC_FILES ...@@ -90,11 +110,13 @@ set ( INC_FILES
inc/MantidMDAlgorithms/BinMD.h inc/MantidMDAlgorithms/BinMD.h
inc/MantidMDAlgorithms/BinaryOperationMD.h inc/MantidMDAlgorithms/BinaryOperationMD.h
inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
inc/MantidMDAlgorithms/BoxControllerSettingsAlgorithm.h
inc/MantidMDAlgorithms/CalculateCoverageDGS.h inc/MantidMDAlgorithms/CalculateCoverageDGS.h
inc/MantidMDAlgorithms/CentroidPeaksMD.h inc/MantidMDAlgorithms/CentroidPeaksMD.h
inc/MantidMDAlgorithms/CentroidPeaksMD2.h inc/MantidMDAlgorithms/CentroidPeaksMD2.h
inc/MantidMDAlgorithms/CloneMDWorkspace.h inc/MantidMDAlgorithms/CloneMDWorkspace.h
inc/MantidMDAlgorithms/CompareMDWorkspaces.h inc/MantidMDAlgorithms/CompareMDWorkspaces.h
inc/MantidMDAlgorithms/ConvToMDBase.h
inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h
...@@ -103,6 +125,7 @@ set ( INC_FILES ...@@ -103,6 +125,7 @@ set ( INC_FILES
inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h
inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h
inc/MantidMDAlgorithms/ConvertToMDParent.h inc/MantidMDAlgorithms/ConvertToMDParent.h
inc/MantidMDAlgorithms/ConvertToReflectometryQ.h
inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
inc/MantidMDAlgorithms/CreateMDWorkspace.h inc/MantidMDAlgorithms/CreateMDWorkspace.h
inc/MantidMDAlgorithms/DivideMD.h inc/MantidMDAlgorithms/DivideMD.h
...@@ -112,9 +135,13 @@ set ( INC_FILES ...@@ -112,9 +135,13 @@ set ( INC_FILES
inc/MantidMDAlgorithms/ExponentialMD.h inc/MantidMDAlgorithms/ExponentialMD.h
inc/MantidMDAlgorithms/FakeMDEventData.h inc/MantidMDAlgorithms/FakeMDEventData.h
inc/MantidMDAlgorithms/FindPeaksMD.h inc/MantidMDAlgorithms/FindPeaksMD.h
inc/MantidMDAlgorithms/FitMD.h
inc/MantidMDAlgorithms/GSLFunctions.h inc/MantidMDAlgorithms/GSLFunctions.h
inc/MantidMDAlgorithms/GreaterThanMD.h inc/MantidMDAlgorithms/GreaterThanMD.h
inc/MantidMDAlgorithms/IDynamicRebinning.h inc/MantidMDAlgorithms/IDynamicRebinning.h
inc/MantidMDAlgorithms/ImportMDEventWorkspace.h
inc/MantidMDAlgorithms/ImportMDHistoWorkspace.h
inc/MantidMDAlgorithms/Integrate3DEvents.h
inc/MantidMDAlgorithms/IntegrateFlux.h inc/MantidMDAlgorithms/IntegrateFlux.h
inc/MantidMDAlgorithms/IntegratePeaksMD.h inc/MantidMDAlgorithms/IntegratePeaksMD.h
inc/MantidMDAlgorithms/IntegratePeaksMD2.h inc/MantidMDAlgorithms/IntegratePeaksMD2.h
...@@ -126,14 +153,21 @@ set ( INC_FILES ...@@ -126,14 +153,21 @@ set ( INC_FILES
inc/MantidMDAlgorithms/LoadMD.h inc/MantidMDAlgorithms/LoadMD.h
inc/MantidMDAlgorithms/LoadSQW.h inc/MantidMDAlgorithms/LoadSQW.h
inc/MantidMDAlgorithms/LogarithmMD.h inc/MantidMDAlgorithms/LogarithmMD.h
inc/MantidMDAlgorithms/MDEventWSWrapper.h
inc/MantidMDAlgorithms/MDNormDirectSC.h inc/MantidMDAlgorithms/MDNormDirectSC.h
inc/MantidMDAlgorithms/MDNormSCD.h inc/MantidMDAlgorithms/MDNormSCD.h
inc/MantidMDAlgorithms/MDTransfAxisNames.h
inc/MantidMDAlgorithms/MDTransfFactory.h
inc/MantidMDAlgorithms/MDTransfModQ.h
inc/MantidMDAlgorithms/MDTransfQ3D.h
inc/MantidMDAlgorithms/MDWSDescription.h
inc/MantidMDAlgorithms/MaskMD.h inc/MantidMDAlgorithms/MaskMD.h
inc/MantidMDAlgorithms/MergeMD.h inc/MantidMDAlgorithms/MergeMD.h
inc/MantidMDAlgorithms/MergeMDFiles.h inc/MantidMDAlgorithms/MergeMDFiles.h
inc/MantidMDAlgorithms/MinusMD.h inc/MantidMDAlgorithms/MinusMD.h
inc/MantidMDAlgorithms/MultiplyMD.h inc/MantidMDAlgorithms/MultiplyMD.h
inc/MantidMDAlgorithms/NotMD.h inc/MantidMDAlgorithms/NotMD.h
inc/MantidMDAlgorithms/OneStepMDEW.h
inc/MantidMDAlgorithms/OrMD.h inc/MantidMDAlgorithms/OrMD.h
inc/MantidMDAlgorithms/PlusMD.h inc/MantidMDAlgorithms/PlusMD.h
inc/MantidMDAlgorithms/PowerMD.h inc/MantidMDAlgorithms/PowerMD.h
...@@ -153,6 +187,11 @@ set ( INC_FILES ...@@ -153,6 +187,11 @@ set ( INC_FILES
inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitYVector.h inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitYVector.h
inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.h inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.h
inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
inc/MantidMDAlgorithms/QueryMDWorkspace.h
inc/MantidMDAlgorithms/ReflectometryTransformKiKf.h
inc/MantidMDAlgorithms/ReflectometryTransformP.h
inc/MantidMDAlgorithms/ReflectometryTransformQxQz.h
inc/MantidMDAlgorithms/SaveIsawQvector.h
inc/MantidMDAlgorithms/SaveMD.h inc/MantidMDAlgorithms/SaveMD.h
inc/MantidMDAlgorithms/SaveZODS.h inc/MantidMDAlgorithms/SaveZODS.h
inc/MantidMDAlgorithms/SetMDUsingMask.h inc/MantidMDAlgorithms/SetMDUsingMask.h
...@@ -161,6 +200,7 @@ set ( INC_FILES ...@@ -161,6 +200,7 @@ set ( INC_FILES
inc/MantidMDAlgorithms/ThresholdMD.h inc/MantidMDAlgorithms/ThresholdMD.h
inc/MantidMDAlgorithms/TransformMD.h inc/MantidMDAlgorithms/TransformMD.h
inc/MantidMDAlgorithms/UnaryOperationMD.h inc/MantidMDAlgorithms/UnaryOperationMD.h
inc/MantidMDAlgorithms/UnitsConversionHelper.h
inc/MantidMDAlgorithms/Vector3DParameter.h inc/MantidMDAlgorithms/Vector3DParameter.h
inc/MantidMDAlgorithms/Vector3DParameterParser.h inc/MantidMDAlgorithms/Vector3DParameterParser.h
inc/MantidMDAlgorithms/WeightedMeanMD.h inc/MantidMDAlgorithms/WeightedMeanMD.h
...@@ -174,12 +214,14 @@ set ( TEST_FILES ...@@ -174,12 +214,14 @@ set ( TEST_FILES
#CreateMDFitWorkspaceTest.h #CreateMDFitWorkspaceTest.h
AndMDTest.h AndMDTest.h
BooleanBinaryOperationMDTest.h BooleanBinaryOperationMDTest.h
BoxControllerSettingsAlgorithmTest.h
CachedExperimentInfoTest.h CachedExperimentInfoTest.h
CalculateCoverageDGSTest.h CalculateCoverageDGSTest.h
CentroidPeaksMD2Test.h CentroidPeaksMD2Test.h
CentroidPeaksMDTest.h CentroidPeaksMDTest.h
CloneMDWorkspaceTest.h CloneMDWorkspaceTest.h
CompareMDWorkspacesTest.h CompareMDWorkspacesTest.h
ConvToMDBaseTest.h
ConvertEventsToMDTest.h ConvertEventsToMDTest.h
ConvertSpiceDataToRealSpaceTest.h ConvertSpiceDataToRealSpaceTest.h
ConvertToDetectorFaceMDTest.h ConvertToDetectorFaceMDTest.h
...@@ -190,6 +232,7 @@ set ( TEST_FILES ...@@ -190,6 +232,7 @@ set ( TEST_FILES
ConvertToMDMinMaxLocalTest.h ConvertToMDMinMaxLocalTest.h
ConvertToMDTest.h ConvertToMDTest.h
ConvertToQ3DdETest.h ConvertToQ3DdETest.h
ConvertToReflectometryQTest.h
CreateMDHistoWorkspaceTest.h CreateMDHistoWorkspaceTest.h
CreateMDWorkspaceTest.h CreateMDWorkspaceTest.h
DivideMDTest.h DivideMDTest.h
...@@ -198,9 +241,13 @@ set ( TEST_FILES ...@@ -198,9 +241,13 @@ set ( TEST_FILES
ExponentialMDTest.h ExponentialMDTest.h
FakeMDEventDataTest.h FakeMDEventDataTest.h
FindPeaksMDTest.h FindPeaksMDTest.h
FitMDTest.h
FitResolutionConvolvedModelTest.h FitResolutionConvolvedModelTest.h
ForegroundModelTest.h ForegroundModelTest.h
GreaterThanMDTest.h GreaterThanMDTest.h
ImportMDEventWorkspaceTest.h
ImportMDHistoWorkspaceTest.h
Integrate3DEventsTest.h
IntegrateFluxTest.h IntegrateFluxTest.h
IntegratePeaksMD2Test.h IntegratePeaksMD2Test.h
IntegratePeaksMDTest.h IntegratePeaksMDTest.h
...@@ -210,9 +257,15 @@ set ( TEST_FILES ...@@ -210,9 +257,15 @@ set ( TEST_FILES
LoadMDTest.h LoadMDTest.h
LoadSQWTest.h LoadSQWTest.h
LogarithmMDTest.h LogarithmMDTest.h
MDEventWSWrapperTest.h
MDNormDirectSCTest.h MDNormDirectSCTest.h
MDNormSCDTest.h MDNormSCDTest.h
MDResolutionConvolutionFactoryTest.h MDResolutionConvolutionFactoryTest.h
MDTransfAxisNamesTest.h
MDTransfFactoryTest.h
MDTransfModQTest.h
MDTransfQ3DTest.h
MDWSDescriptionTest.h
MaskMDTest.h MaskMDTest.h
MergeMDFilesTest.h MergeMDFilesTest.h
MergeMDTest.h MergeMDTest.h
...@@ -221,11 +274,17 @@ set ( TEST_FILES ...@@ -221,11 +274,17 @@ set ( TEST_FILES
MullerAnsatzTest.h MullerAnsatzTest.h
MultiplyMDTest.h MultiplyMDTest.h
NotMDTest.h NotMDTest.h
OneStepMDEWTest.h
OrMDTest.h OrMDTest.h
PlusMDTest.h PlusMDTest.h
PowerMDTest.h PowerMDTest.h
PreprocessDetectorsToMDTest.h PreprocessDetectorsToMDTest.h
QueryMDWorkspaceTest.h
ReflectometryTransformKiKfTest.h
ReflectometryTransformPTest.h
ReflectometryTransformQxQzTest.h
ResolutionConvolvedCrossSectionTest.h ResolutionConvolvedCrossSectionTest.h
SaveIsawQvectorTest.h
SaveMDTest.h SaveMDTest.h
SaveZODSTest.h SaveZODSTest.h
SetMDUsingMaskTest.h SetMDUsingMaskTest.h
...@@ -239,6 +298,7 @@ set ( TEST_FILES ...@@ -239,6 +298,7 @@ set ( TEST_FILES
TobyFitYVectorTest.h TobyFitYVectorTest.h
TransformMDTest.h TransformMDTest.h
UnaryOperationMDTest.h UnaryOperationMDTest.h
UnitsConversionHelperTest.h
WeightedMeanMDTest.h WeightedMeanMDTest.h
XorMDTest.h XorMDTest.h
) )
......
...@@ -43,8 +43,8 @@ public: ...@@ -43,8 +43,8 @@ public:
virtual int version() const; virtual int version() const;
private: private:
void execHistoHisto(Mantid::MDEvents::MDHistoWorkspace_sptr out, void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
Mantid::MDEvents::MDHistoWorkspace_const_sptr operand); Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
}; };
} // namespace MDAlgorithms } // namespace MDAlgorithms
......
#ifndef MANTID_MDEVENTS_BINMD_H_ #ifndef MANTID_MDALGORITHMS_BINMD_H_
#define MANTID_MDEVENTS_BINMD_H_ #define MANTID_MDALGORITHMS_BINMD_H_
#include "MantidAPI/Algorithm.h" #include "MantidAPI/Algorithm.h"
#include "MantidAPI/CoordTransform.h" #include "MantidAPI/CoordTransform.h"
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
#include "MantidGeometry/MDGeometry/MDImplicitFunction.h" #include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
#include "MantidKernel/System.h" #include "MantidKernel/System.h"
#include "MantidKernel/VMD.h" #include "MantidKernel/VMD.h"
#include "MantidMDEvents/MDBox.h" #include "MantidDataObjects/MDBox.h"
#include "MantidMDEvents/MDEventFactory.h" #include "MantidDataObjects/MDEventFactory.h"
#include "MantidMDEvents/MDEventWorkspace.h" #include "MantidDataObjects/MDEventWorkspace.h"
#include "MantidMDEvents/MDHistoWorkspace.h" #include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidMDAlgorithms/SlicingAlgorithm.h" #include "MantidMDAlgorithms/SlicingAlgorithm.h"
namespace Mantid { namespace Mantid {
...@@ -60,15 +60,15 @@ private: ...@@ -60,15 +60,15 @@ private:
/// Helper method /// Helper method
template <typename MDE, size_t nd> template <typename MDE, size_t nd>
void binByIterating(typename MDEvents::MDEventWorkspace<MDE, nd>::sptr ws); void binByIterating(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
/// Method to bin a single MDBox /// Method to bin a single MDBox
template <typename MDE, size_t nd> template <typename MDE, size_t nd>
void binMDBox(MDEvents::MDBox<MDE, nd> *box, const size_t *const chunkMin, void binMDBox(DataObjects::MDBox<MDE, nd> *box, const size_t *const chunkMin,
const size_t *const chunkMax); const size_t *const chunkMax);
/// The output MDHistoWorkspace /// The output MDHistoWorkspace
Mantid::MDEvents::MDHistoWorkspace_sptr outWS; Mantid::DataObjects::MDHistoWorkspace_sptr outWS;
/// Progress reporting /// Progress reporting
Mantid::API::Progress *prog; Mantid::API::Progress *prog;
/// ImplicitFunction used /// ImplicitFunction used
...@@ -82,6 +82,6 @@ private: ...@@ -82,6 +82,6 @@ private:
}; };
} // namespace Mantid } // namespace Mantid
} // namespace MDEvents } // namespace DataObjects
#endif /* MANTID_MDEVENTS_BINMD_H_ */ #endif /* MANTID_MDALGORITHMS_BINMD_H_ */
#ifndef MANTID_MDALGORITHMS_BINARYOPERATIONMD_H_ #ifndef MANTID_MDALGORITHMS_BINARYOPERATIONMD_H_
#define MANTID_MDALGORITHMS_BINARYOPERATIONMD_H_ #define MANTID_MDALGORITHMS_BINARYOPERATIONMD_H_
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h" #include "MantidAPI/Algorithm.h"
#include "MantidAPI/IMDWorkspace.h"
#include "MantidMDEvents/MDEventWorkspace.h"
#include "MantidMDEvents/MDHistoWorkspace.h"
#include "MantidAPI/IMDEventWorkspace.h" #include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/IMDWorkspace.h"
#include "MantidDataObjects/MDEventWorkspace.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidDataObjects/WorkspaceSingleValue.h" #include "MantidDataObjects/WorkspaceSingleValue.h"
namespace Mantid { namespace Mantid {
...@@ -69,12 +68,12 @@ protected: ...@@ -69,12 +68,12 @@ protected:
/// Run the algorithm with a MDHisotWorkspace as output and operand /// Run the algorithm with a MDHisotWorkspace as output and operand
virtual void virtual void
execHistoHisto(Mantid::MDEvents::MDHistoWorkspace_sptr out, execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
Mantid::MDEvents::MDHistoWorkspace_const_sptr operand) = 0; Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) = 0;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand /// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
virtual void execHistoScalar( virtual void execHistoScalar(
Mantid::MDEvents::MDHistoWorkspace_sptr out, Mantid::DataObjects::MDHistoWorkspace_sptr out,
Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) = 0; Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) = 0;
/// The name of the first input workspace property /// The name of the first input workspace property
...@@ -98,8 +97,8 @@ protected: ...@@ -98,8 +97,8 @@ protected:
/// For checkInputs /// For checkInputs
Mantid::API::IMDEventWorkspace_sptr m_lhs_event; Mantid::API::IMDEventWorkspace_sptr m_lhs_event;
Mantid::API::IMDEventWorkspace_sptr m_rhs_event; Mantid::API::IMDEventWorkspace_sptr m_rhs_event;
Mantid::MDEvents::MDHistoWorkspace_sptr m_lhs_histo; Mantid::DataObjects::MDHistoWorkspace_sptr m_lhs_histo;
Mantid::MDEvents::MDHistoWorkspace_sptr m_rhs_histo; Mantid::DataObjects::MDHistoWorkspace_sptr m_rhs_histo;
Mantid::DataObjects::WorkspaceSingleValue_sptr m_lhs_scalar; Mantid::DataObjects::WorkspaceSingleValue_sptr m_lhs_scalar;
Mantid::DataObjects::WorkspaceSingleValue_sptr m_rhs_scalar; Mantid::DataObjects::WorkspaceSingleValue_sptr m_rhs_scalar;
...@@ -109,9 +108,9 @@ protected: ...@@ -109,9 +108,9 @@ protected:
Mantid::API::IMDEventWorkspace_sptr m_out_event; Mantid::API::IMDEventWorkspace_sptr m_out_event;
/// Operand MDHistoWorkspace /// Operand MDHistoWorkspace
Mantid::MDEvents::MDHistoWorkspace_sptr m_operand_histo; Mantid::DataObjects::MDHistoWorkspace_sptr m_operand_histo;
/// Output MDHistoWorkspace /// Output MDHistoWorkspace
Mantid::MDEvents::MDHistoWorkspace_sptr m_out_histo; Mantid::DataObjects::MDHistoWorkspace_sptr m_out_histo;
/// Operand WorkspaceSingleValue /// Operand WorkspaceSingleValue
Mantid::DataObjects::WorkspaceSingleValue_sptr m_operand_scalar; Mantid::DataObjects::WorkspaceSingleValue_sptr m_operand_scalar;
......
...@@ -52,13 +52,13 @@ protected: ...@@ -52,13 +52,13 @@ protected:
void checkInputs(); void checkInputs();
void execEvent(); void execEvent();
virtual void virtual void
execHistoScalar(Mantid::MDEvents::MDHistoWorkspace_sptr out, execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar); Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
/// Run the algorithm with a MDHisotWorkspace as output and operand /// Run the algorithm with a MDHisotWorkspace as output and operand
virtual void virtual void
execHistoHisto(Mantid::MDEvents::MDHistoWorkspace_sptr out, execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
Mantid::MDEvents::MDHistoWorkspace_const_sptr operand) = 0; Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) = 0;
}; };
} // namespace MDAlgorithms } // namespace MDAlgorithms
......
#ifndef MANTID_MDEVENTS_BOXCONTROLLERSETTINGSALGORITHM_H_ #ifndef MANTID_MDALGORITHMS_BOXCONTROLLERSETTINGSALGORITHM_H_
#define MANTID_MDEVENTS_BOXCONTROLLERSETTINGSALGORITHM_H_ #define MANTID_MDALGORITHMS_BOXCONTROLLERSETTINGSALGORITHM_H_
#include "MantidKernel/System.h" #include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h" #include "MantidAPI/Algorithm.h"
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "MantidGeometry/Instrument.h" #include "MantidGeometry/Instrument.h"
namespace Mantid { namespace Mantid {
namespace MDEvents { namespace MDAlgorithms {
/** An abstract algorithm sub-class for algorithms that /** An abstract algorithm sub-class for algorithms that
* define properties for BoxController settings. * define properties for BoxController settings.
...@@ -65,7 +65,7 @@ protected: ...@@ -65,7 +65,7 @@ protected:
private: private:
}; };
} // namespace MDEvents } // namespace MDAlgorithms
} // namespace Mantid } // namespace Mantid
#endif /* MANTID_MDEVENTS_BOXCONTROLLERSETTINGSALGORITHM_H_ */ #endif /* MANTID_MDALGORITHMS_BOXCONTROLLERSETTINGSALGORITHM_H_ */
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "MantidKernel/System.h" #include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h" #include "MantidAPI/Algorithm.h"
#include "MantidKernel/Matrix.h" #include "MantidKernel/Matrix.h"
#include "MantidMDEvents/MDHistoWorkspace.h" #include "MantidDataObjects/MDHistoWorkspace.h"
namespace Mantid { namespace Mantid {
namespace MDAlgorithms { namespace MDAlgorithms {
...@@ -60,7 +60,7 @@ private: ...@@ -60,7 +60,7 @@ private:
Mantid::Kernel::DblMatrix m_rubw; Mantid::Kernel::DblMatrix m_rubw;
/// Normalization workspace (this is the coverage workspace) /// Normalization workspace (this is the coverage workspace)
Mantid::MDEvents::MDHistoWorkspace_sptr m_normWS; Mantid::DataObjects::MDHistoWorkspace_sptr m_normWS;
std::vector<Kernel::VMD> calculateIntersections(const double theta, std::vector<Kernel::VMD> calculateIntersections(const double theta,
const double phi); const double phi);
......