Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
b2519752
Commit
b2519752
authored
Mar 08, 2015
by
Martyn Gigg
Browse files
Move the algorithms from MDEvents to MDAlgorithms.
Refs #11209
parent
0fd1c3dc
Changes
184
Hide whitespace changes
Inline
Side-by-side
Code/Mantid/Framework/CMakeLists.txt
View file @
b2519752
...
...
@@ -125,7 +125,6 @@ if ( CXXTEST_FOUND )
endif
()
add_subdirectory
(
MDAlgorithms
)
add_subdirectory
(
MDEvents
)
add_subdirectory
(
Doxygen
)
add_subdirectory
(
ScriptRepository
)
add_subdirectory
(
ISISLiveData
)
...
...
Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
View file @
b2519752
...
...
@@ -7,11 +7,13 @@ set ( SRC_FILES
src/BinMD.cpp
src/BinaryOperationMD.cpp
src/BooleanBinaryOperationMD.cpp
src/BoxControllerSettingsAlgorithm.cpp
src/CalculateCoverageDGS.cpp
src/CentroidPeaksMD.cpp
src/CentroidPeaksMD2.cpp
src/CloneMDWorkspace.cpp
src/CompareMDWorkspaces.cpp
src/ConvToMDBase.cpp
src/ConvertSpiceDataToRealSpace.cpp
src/ConvertToDetectorFaceMD.cpp
src/ConvertToDiffractionMDWorkspace.cpp
...
...
@@ -20,6 +22,7 @@ set ( SRC_FILES
src/ConvertToMDMinMaxGlobal.cpp
src/ConvertToMDMinMaxLocal.cpp
src/ConvertToMDParent.cpp
src/ConvertToReflectometryQ.cpp
src/CreateMDHistoWorkspace.cpp
src/CreateMDWorkspace.cpp
src/DivideMD.cpp
...
...
@@ -28,8 +31,12 @@ set ( SRC_FILES
src/ExponentialMD.cpp
src/FakeMDEventData.cpp
src/FindPeaksMD.cpp
src/FitMD.cpp
src/GreaterThanMD.cpp
src/IDynamicRebinning.cpp
src/ImportMDEventWorkspace.cpp
src/ImportMDHistoWorkspace.cpp
src/Integrate3DEvents.cpp
src/IntegrateFlux.cpp
src/IntegratePeaksMD.cpp
src/IntegratePeaksMD2.cpp
...
...
@@ -41,14 +48,21 @@ set ( SRC_FILES
src/LoadMD.cpp
src/LoadSQW.cpp
src/LogarithmMD.cpp
src/MDEventWSWrapper.cpp
src/MDNormDirectSC.cpp
src/MDNormSCD.cpp
src/MDTransfAxisNames.cpp
src/MDTransfFactory.cpp
src/MDTransfModQ.cpp
src/MDTransfQ3D.cpp
src/MDWSDescription.cpp
src/MaskMD.cpp
src/MergeMD.cpp
src/MergeMDFiles.cpp
src/MinusMD.cpp
src/MultiplyMD.cpp
src/NotMD.cpp
src/OneStepMDEW.cpp
src/OrMD.cpp
src/PlusMD.cpp
src/PowerMD.cpp
...
...
@@ -68,6 +82,11 @@ set ( SRC_FILES
src/Quantification/Resolution/TobyFitYVector.cpp
src/Quantification/ResolutionConvolvedCrossSection.cpp
src/Quantification/SimulateResolutionConvolvedModel.cpp
src/QueryMDWorkspace.cpp
src/ReflectometryTransformKiKf.cpp
src/ReflectometryTransformP.cpp
src/ReflectometryTransformQxQz.cpp
src/SaveIsawQvector.cpp
src/SaveMD.cpp
src/SaveZODS.cpp
src/SetMDUsingMask.cpp
...
...
@@ -76,6 +95,7 @@ set ( SRC_FILES
src/ThresholdMD.cpp
src/TransformMD.cpp
src/UnaryOperationMD.cpp
src/UnitsConversionHelper.cpp
src/Vector3DParameterParser.cpp
src/WeightedMeanMD.cpp
src/XorMD.cpp
...
...
@@ -90,11 +110,13 @@ set ( INC_FILES
inc/MantidMDAlgorithms/BinMD.h
inc/MantidMDAlgorithms/BinaryOperationMD.h
inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
inc/MantidMDAlgorithms/BoxControllerSettingsAlgorithm.h
inc/MantidMDAlgorithms/CalculateCoverageDGS.h
inc/MantidMDAlgorithms/CentroidPeaksMD.h
inc/MantidMDAlgorithms/CentroidPeaksMD2.h
inc/MantidMDAlgorithms/CloneMDWorkspace.h
inc/MantidMDAlgorithms/CompareMDWorkspaces.h
inc/MantidMDAlgorithms/ConvToMDBase.h
inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h
...
...
@@ -103,6 +125,7 @@ set ( INC_FILES
inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h
inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h
inc/MantidMDAlgorithms/ConvertToMDParent.h
inc/MantidMDAlgorithms/ConvertToReflectometryQ.h
inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
inc/MantidMDAlgorithms/CreateMDWorkspace.h
inc/MantidMDAlgorithms/DivideMD.h
...
...
@@ -112,9 +135,13 @@ set ( INC_FILES
inc/MantidMDAlgorithms/ExponentialMD.h
inc/MantidMDAlgorithms/FakeMDEventData.h
inc/MantidMDAlgorithms/FindPeaksMD.h
inc/MantidMDAlgorithms/FitMD.h
inc/MantidMDAlgorithms/GSLFunctions.h
inc/MantidMDAlgorithms/GreaterThanMD.h
inc/MantidMDAlgorithms/IDynamicRebinning.h
inc/MantidMDAlgorithms/ImportMDEventWorkspace.h
inc/MantidMDAlgorithms/ImportMDHistoWorkspace.h
inc/MantidMDAlgorithms/Integrate3DEvents.h
inc/MantidMDAlgorithms/IntegrateFlux.h
inc/MantidMDAlgorithms/IntegratePeaksMD.h
inc/MantidMDAlgorithms/IntegratePeaksMD2.h
...
...
@@ -126,14 +153,21 @@ set ( INC_FILES
inc/MantidMDAlgorithms/LoadMD.h
inc/MantidMDAlgorithms/LoadSQW.h
inc/MantidMDAlgorithms/LogarithmMD.h
inc/MantidMDAlgorithms/MDEventWSWrapper.h
inc/MantidMDAlgorithms/MDNormDirectSC.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/MergeMD.h
inc/MantidMDAlgorithms/MergeMDFiles.h
inc/MantidMDAlgorithms/MinusMD.h
inc/MantidMDAlgorithms/MultiplyMD.h
inc/MantidMDAlgorithms/NotMD.h
inc/MantidMDAlgorithms/OneStepMDEW.h
inc/MantidMDAlgorithms/OrMD.h
inc/MantidMDAlgorithms/PlusMD.h
inc/MantidMDAlgorithms/PowerMD.h
...
...
@@ -153,6 +187,11 @@ set ( INC_FILES
inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitYVector.h
inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.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/SaveZODS.h
inc/MantidMDAlgorithms/SetMDUsingMask.h
...
...
@@ -161,6 +200,7 @@ set ( INC_FILES
inc/MantidMDAlgorithms/ThresholdMD.h
inc/MantidMDAlgorithms/TransformMD.h
inc/MantidMDAlgorithms/UnaryOperationMD.h
inc/MantidMDAlgorithms/UnitsConversionHelper.h
inc/MantidMDAlgorithms/Vector3DParameter.h
inc/MantidMDAlgorithms/Vector3DParameterParser.h
inc/MantidMDAlgorithms/WeightedMeanMD.h
...
...
@@ -174,12 +214,14 @@ set ( TEST_FILES
#CreateMDFitWorkspaceTest.h
AndMDTest.h
BooleanBinaryOperationMDTest.h
BoxControllerSettingsAlgorithmTest.h
CachedExperimentInfoTest.h
CalculateCoverageDGSTest.h
CentroidPeaksMD2Test.h
CentroidPeaksMDTest.h
CloneMDWorkspaceTest.h
CompareMDWorkspacesTest.h
ConvToMDBaseTest.h
ConvertEventsToMDTest.h
ConvertSpiceDataToRealSpaceTest.h
ConvertToDetectorFaceMDTest.h
...
...
@@ -190,6 +232,7 @@ set ( TEST_FILES
ConvertToMDMinMaxLocalTest.h
ConvertToMDTest.h
ConvertToQ3DdETest.h
ConvertToReflectometryQTest.h
CreateMDHistoWorkspaceTest.h
CreateMDWorkspaceTest.h
DivideMDTest.h
...
...
@@ -198,9 +241,13 @@ set ( TEST_FILES
ExponentialMDTest.h
FakeMDEventDataTest.h
FindPeaksMDTest.h
FitMDTest.h
FitResolutionConvolvedModelTest.h
ForegroundModelTest.h
GreaterThanMDTest.h
ImportMDEventWorkspaceTest.h
ImportMDHistoWorkspaceTest.h
Integrate3DEventsTest.h
IntegrateFluxTest.h
IntegratePeaksMD2Test.h
IntegratePeaksMDTest.h
...
...
@@ -210,9 +257,15 @@ set ( TEST_FILES
LoadMDTest.h
LoadSQWTest.h
LogarithmMDTest.h
MDEventWSWrapperTest.h
MDNormDirectSCTest.h
MDNormSCDTest.h
MDResolutionConvolutionFactoryTest.h
MDTransfAxisNamesTest.h
MDTransfFactoryTest.h
MDTransfModQTest.h
MDTransfQ3DTest.h
MDWSDescriptionTest.h
MaskMDTest.h
MergeMDFilesTest.h
MergeMDTest.h
...
...
@@ -221,11 +274,17 @@ set ( TEST_FILES
MullerAnsatzTest.h
MultiplyMDTest.h
NotMDTest.h
OneStepMDEWTest.h
OrMDTest.h
PlusMDTest.h
PowerMDTest.h
PreprocessDetectorsToMDTest.h
QueryMDWorkspaceTest.h
ReflectometryTransformKiKfTest.h
ReflectometryTransformPTest.h
ReflectometryTransformQxQzTest.h
ResolutionConvolvedCrossSectionTest.h
SaveIsawQvectorTest.h
SaveMDTest.h
SaveZODSTest.h
SetMDUsingMaskTest.h
...
...
@@ -239,6 +298,7 @@ set ( TEST_FILES
TobyFitYVectorTest.h
TransformMDTest.h
UnaryOperationMDTest.h
UnitsConversionHelperTest.h
WeightedMeanMDTest.h
XorMDTest.h
)
...
...
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AndMD.h
View file @
b2519752
...
...
@@ -43,8 +43,8 @@ public:
virtual
int
version
()
const
;
private:
void
execHistoHisto
(
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
MDEven
ts
::
MDHistoWorkspace_const_sptr
operand
);
void
execHistoHisto
(
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_const_sptr
operand
);
};
}
// namespace MDAlgorithms
...
...
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinMD.h
View file @
b2519752
#ifndef MANTID_MD
EVENT
S_BINMD_H_
#define MANTID_MD
EVENT
S_BINMD_H_
#ifndef MANTID_MD
ALGORITHM
S_BINMD_H_
#define MANTID_MD
ALGORITHM
S_BINMD_H_
#include
"MantidAPI/Algorithm.h"
#include
"MantidAPI/CoordTransform.h"
...
...
@@ -8,10 +8,10 @@
#include
"MantidGeometry/MDGeometry/MDImplicitFunction.h"
#include
"MantidKernel/System.h"
#include
"MantidKernel/VMD.h"
#include
"Mantid
MDEven
ts/MDBox.h"
#include
"Mantid
MDEven
ts/MDEventFactory.h"
#include
"Mantid
MDEven
ts/MDEventWorkspace.h"
#include
"Mantid
MDEven
ts/MDHistoWorkspace.h"
#include
"Mantid
DataObjec
ts/MDBox.h"
#include
"Mantid
DataObjec
ts/MDEventFactory.h"
#include
"Mantid
DataObjec
ts/MDEventWorkspace.h"
#include
"Mantid
DataObjec
ts/MDHistoWorkspace.h"
#include
"MantidMDAlgorithms/SlicingAlgorithm.h"
namespace
Mantid
{
...
...
@@ -60,15 +60,15 @@ private:
/// Helper method
template
<
typename
MDE
,
size_t
nd
>
void
binByIterating
(
typename
MDEven
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
void
binByIterating
(
typename
DataObjec
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
/// Method to bin a single MDBox
template
<
typename
MDE
,
size_t
nd
>
void
binMDBox
(
MDEven
ts
::
MDBox
<
MDE
,
nd
>
*
box
,
const
size_t
*
const
chunkMin
,
void
binMDBox
(
DataObjec
ts
::
MDBox
<
MDE
,
nd
>
*
box
,
const
size_t
*
const
chunkMin
,
const
size_t
*
const
chunkMax
);
/// The output MDHistoWorkspace
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
outWS
;
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
outWS
;
/// Progress reporting
Mantid
::
API
::
Progress
*
prog
;
/// ImplicitFunction used
...
...
@@ -82,6 +82,6 @@ private:
};
}
// namespace Mantid
}
// namespace
MDEven
ts
}
// namespace
DataObjec
ts
#endif
/* MANTID_MD
EVENT
S_BINMD_H_ */
#endif
/* MANTID_MD
ALGORITHM
S_BINMD_H_ */
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinaryOperationMD.h
View file @
b2519752
#ifndef MANTID_MDALGORITHMS_BINARYOPERATIONMD_H_
#define MANTID_MDALGORITHMS_BINARYOPERATIONMD_H_
#include
"MantidKernel/System.h"
#include
"MantidAPI/Algorithm.h"
#include
"MantidAPI/IMDWorkspace.h"
#include
"MantidMDEvents/MDEventWorkspace.h"
#include
"MantidMDEvents/MDHistoWorkspace.h"
#include
"MantidAPI/IMDEventWorkspace.h"
#include
"MantidAPI/IMDWorkspace.h"
#include
"MantidDataObjects/MDEventWorkspace.h"
#include
"MantidDataObjects/MDHistoWorkspace.h"
#include
"MantidDataObjects/WorkspaceSingleValue.h"
namespace
Mantid
{
...
...
@@ -69,12 +68,12 @@ protected:
/// Run the algorithm with a MDHisotWorkspace as output and operand
virtual
void
execHistoHisto
(
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
MDEven
ts
::
MDHistoWorkspace_const_sptr
operand
)
=
0
;
execHistoHisto
(
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_const_sptr
operand
)
=
0
;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
virtual
void
execHistoScalar
(
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
DataObjects
::
WorkspaceSingleValue_const_sptr
scalar
)
=
0
;
/// The name of the first input workspace property
...
...
@@ -98,8 +97,8 @@ protected:
/// For checkInputs
Mantid
::
API
::
IMDEventWorkspace_sptr
m_lhs_event
;
Mantid
::
API
::
IMDEventWorkspace_sptr
m_rhs_event
;
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
m_lhs_histo
;
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
m_rhs_histo
;
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
m_lhs_histo
;
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
m_rhs_histo
;
Mantid
::
DataObjects
::
WorkspaceSingleValue_sptr
m_lhs_scalar
;
Mantid
::
DataObjects
::
WorkspaceSingleValue_sptr
m_rhs_scalar
;
...
...
@@ -109,9 +108,9 @@ protected:
Mantid
::
API
::
IMDEventWorkspace_sptr
m_out_event
;
/// Operand MDHistoWorkspace
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
m_operand_histo
;
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
m_operand_histo
;
/// Output MDHistoWorkspace
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
m_out_histo
;
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
m_out_histo
;
/// Operand WorkspaceSingleValue
Mantid
::
DataObjects
::
WorkspaceSingleValue_sptr
m_operand_scalar
;
...
...
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
View file @
b2519752
...
...
@@ -52,13 +52,13 @@ protected:
void
checkInputs
();
void
execEvent
();
virtual
void
execHistoScalar
(
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
out
,
execHistoScalar
(
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
DataObjects
::
WorkspaceSingleValue_const_sptr
scalar
);
/// Run the algorithm with a MDHisotWorkspace as output and operand
virtual
void
execHistoHisto
(
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
MDEven
ts
::
MDHistoWorkspace_const_sptr
operand
)
=
0
;
execHistoHisto
(
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
out
,
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_const_sptr
operand
)
=
0
;
};
}
// namespace MDAlgorithms
...
...
Code/Mantid/Framework/MD
Event
s/inc/MantidMD
Event
s/BoxControllerSettingsAlgorithm.h
→
Code/Mantid/Framework/MD
Algorithm
s/inc/MantidMD
Algorithm
s/BoxControllerSettingsAlgorithm.h
View file @
b2519752
#ifndef MANTID_MD
EVENT
S_BOXCONTROLLERSETTINGSALGORITHM_H_
#define MANTID_MD
EVENT
S_BOXCONTROLLERSETTINGSALGORITHM_H_
#ifndef MANTID_MD
ALGORITHM
S_BOXCONTROLLERSETTINGSALGORITHM_H_
#define MANTID_MD
ALGORITHM
S_BOXCONTROLLERSETTINGSALGORITHM_H_
#include
"MantidKernel/System.h"
#include
"MantidAPI/Algorithm.h"
...
...
@@ -7,7 +7,7 @@
#include
"MantidGeometry/Instrument.h"
namespace
Mantid
{
namespace
MD
Event
s
{
namespace
MD
Algorithm
s
{
/** An abstract algorithm sub-class for algorithms that
* define properties for BoxController settings.
...
...
@@ -65,7 +65,7 @@ protected:
private:
};
}
// namespace MD
Event
s
}
// namespace MD
Algorithm
s
}
// namespace Mantid
#endif
/* MANTID_MD
EVENT
S_BOXCONTROLLERSETTINGSALGORITHM_H_ */
#endif
/* MANTID_MD
ALGORITHM
S_BOXCONTROLLERSETTINGSALGORITHM_H_ */
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
View file @
b2519752
...
...
@@ -4,7 +4,7 @@
#include
"MantidKernel/System.h"
#include
"MantidAPI/Algorithm.h"
#include
"MantidKernel/Matrix.h"
#include
"Mantid
MDEven
ts/MDHistoWorkspace.h"
#include
"Mantid
DataObjec
ts/MDHistoWorkspace.h"
namespace
Mantid
{
namespace
MDAlgorithms
{
...
...
@@ -60,7 +60,7 @@ private:
Mantid
::
Kernel
::
DblMatrix
m_rubw
;
/// Normalization workspace (this is the coverage workspace)
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
m_normWS
;
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
m_normWS
;
std
::
vector
<
Kernel
::
VMD
>
calculateIntersections
(
const
double
theta
,
const
double
phi
);
...
...
Code/Mantid/Framework/MD
Event
s/inc/MantidMD
Event
s/CalculateReflectometryQBase.h
→
Code/Mantid/Framework/MD
Algorithm
s/inc/MantidMD
Algorithm
s/CalculateReflectometryQBase.h
View file @
b2519752
#ifndef MANTID_MD
EVENT
S_CALCULATE_REFLECTOMETRYQ_BASE_H_
#define MANTID_MD
EVENT
S_CALCULATE_REFLECTOMETRYQ_BASE_H_
#ifndef MANTID_MD
ALGORITHM
S_CALCULATE_REFLECTOMETRYQ_BASE_H_
#define MANTID_MD
ALGORITHM
S_CALCULATE_REFLECTOMETRYQ_BASE_H_
#include
"MantidKernel/System.h"
...
...
@@ -10,7 +10,7 @@ class IMDDimension;
}
}
namespace
MD
Event
s
{
namespace
MD
Algorithm
s
{
/**
Base class for reflectometry Q transformations
*/
...
...
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD.h
View file @
b2519752
...
...
@@ -5,7 +5,7 @@
#include
"MantidAPI/Algorithm.h"
#include
"MantidAPI/IMDEventWorkspace.h"
#include
"MantidDataObjects/PeaksWorkspace.h"
#include
"Mantid
MDEven
ts/MDEventWorkspace.h"
#include
"Mantid
DataObjec
ts/MDEventWorkspace.h"
namespace
Mantid
{
namespace
MDAlgorithms
{
...
...
@@ -41,13 +41,13 @@ private:
void
exec
();
template
<
typename
MDE
,
size_t
nd
>
void
integrate
(
typename
MDEven
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
void
integrate
(
typename
DataObjec
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
/// Input MDEventWorkspace
Mantid
::
API
::
IMDEventWorkspace_sptr
inWS
;
};
}
// namespace Mantid
}
// namespace
MDEven
ts
}
// namespace
DataObjec
ts
#endif
/* MANTID_MD
EVENT
S_CENTROIDPEAKSMD_H_ */
#endif
/* MANTID_MD
ALGORITHM
S_CENTROIDPEAKSMD_H_ */
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD2.h
View file @
b2519752
...
...
@@ -5,7 +5,7 @@
#include
"MantidAPI/Algorithm.h"
#include
"MantidAPI/IMDEventWorkspace.h"
#include
"MantidDataObjects/PeaksWorkspace.h"
#include
"Mantid
MDEven
ts/MDEventWorkspace.h"
#include
"Mantid
DataObjec
ts/MDEventWorkspace.h"
namespace
Mantid
{
namespace
MDAlgorithms
{
...
...
@@ -41,13 +41,13 @@ private:
void
exec
();
template
<
typename
MDE
,
size_t
nd
>
void
integrate
(
typename
MDEven
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
void
integrate
(
typename
DataObjec
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
/// Input MDEventWorkspace
Mantid
::
API
::
IMDEventWorkspace_sptr
inWS
;
};
}
// namespace Mantid
}
// namespace
MDEven
ts
}
// namespace
DataObjec
ts
#endif
/* MANTID_MD
EVENT
S_CENTROIDPEAKSMD2_H_ */
#endif
/* MANTID_MD
ALGORITHM
S_CENTROIDPEAKSMD2_H_ */
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CloneMDWorkspace.h
View file @
b2519752
#ifndef MANTID_MD
EVENT
S_CLONEMDWORKSPACE_H_
#define MANTID_MD
EVENT
S_CLONEMDWORKSPACE_H_
#ifndef MANTID_MD
ALGORITHM
S_CLONEMDWORKSPACE_H_
#define MANTID_MD
ALGORITHM
S_CLONEMDWORKSPACE_H_
#include
"MantidKernel/System.h"
#include
"MantidAPI/Algorithm.h"
#include
"Mantid
MDEven
ts/MDEventWorkspace.h"
#include
"Mantid
DataObjec
ts/MDEventWorkspace.h"
namespace
Mantid
{
namespace
MDAlgorithms
{
...
...
@@ -60,10 +60,10 @@ private:
void
exec
();
template
<
typename
MDE
,
size_t
nd
>
void
doClone
(
const
typename
MDEven
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
void
doClone
(
const
typename
DataObjec
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
};
}
// namespace
MDEven
ts
}
// namespace
DataObjec
ts
}
// namespace Mantid
#endif
/* MANTID_MD
EVENT
S_CLONEMDWORKSPACE_H_ */
#endif
/* MANTID_MD
ALGORITHM
S_CLONEMDWORKSPACE_H_ */
Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompareMDWorkspaces.h
View file @
b2519752
...
...
@@ -4,8 +4,8 @@
#include
"MantidKernel/System.h"
#include
"MantidAPI/Algorithm.h"
#include
"MantidAPI/IMDWorkspace.h"
#include
"Mantid
MDEven
ts/MDHistoWorkspace.h"
#include
"Mantid
MDEven
ts/MDEventWorkspace.h"
#include
"Mantid
DataObjec
ts/MDHistoWorkspace.h"
#include
"Mantid
DataObjec
ts/MDEventWorkspace.h"
namespace
Mantid
{
namespace
MDAlgorithms
{
...
...
@@ -55,12 +55,12 @@ private:
void
doComparison
();
void
compareMDGeometry
(
Mantid
::
API
::
IMDWorkspace_sptr
ws1
,
Mantid
::
API
::
IMDWorkspace_sptr
ws2
);
void
compareMDHistoWorkspaces
(
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
ws1
,
Mantid
::
MDEven
ts
::
MDHistoWorkspace_sptr
ws2
);
void
compareMDHistoWorkspaces
(
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
ws1
,
Mantid
::
DataObjec
ts
::
MDHistoWorkspace_sptr
ws2
);
template
<
typename
MDE
,
size_t
nd
>
void
compareMDWorkspaces
(
typename
Mantid
::
MDEven
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
typename
Mantid
::
DataObjec
ts
::
MDEventWorkspace
<
MDE
,
nd
>::
sptr
ws
);
template
<
typename
T
>
void
compare
(
T
a
,
T
b
,
const
std
::
string
&
message
);
...
...
Code/Mantid/Framework/MD
Event
s/inc/MantidMD
Event
s/ConvToMDBase.h
→
Code/Mantid/Framework/MD
Algorithm
s/inc/MantidMD
Algorithm
s/ConvToMDBase.h
View file @
b2519752
#ifndef MANTID_MDEVENTS_CONVERTMD_BASE_H
#define MANTID_MDEVENTS_CONVERTMD_BASE_H
#include
"MantidKernel/Logger.h"
#ifndef MANTID_MDALGORITHMS_CONVERTMD_BASE_H
#define MANTID_MDALGORITHMS_CONVERTMD_BASE_H
#include
"MantidAPI/ExperimentInfo.h"
#include
"MantidAPI/MatrixWorkspace.h"
#include
"MantidAPI/NumericAxis.h"
#include
"MantidAPI/Progress.h"
#include
"Mantid
API/ExperimentInfo
.h"
#include
"Mantid
Kernel/Logger
.h"
#include
"MantidAPI/MatrixWorkspace.h"
#include
"MantidMDAlgorithms/MDWSDescription.h"
#include
"MantidMDAlgorithms/MDEventWSWrapper.h"
#include
"MantidMDAlgorithms/MDTransfInterface.h"
#include
"MantidMDAlgorithms/MDTransfFactory.h"
#include
"MantidMDAlgorithms/UnitsConversionHelper.h"
#include
"MantidMDEvents/MDWSDescription.h"
#include
"MantidMDEvents/MDEventWSWrapper.h"
namespace
Mantid
{
namespace
MDAlgorithms
{
/** Class describes the interface to the methods, which perform conversion from
usual workspaces to MDEventWorkspace
#include
"MantidMDEvents/MDTransfInterface.h"
#include
"MantidMDEvents/MDTransfFactory.h"
See http://www.mantidproject.org/Writing_custom_ConvertTo_MD_transformation
for detailed description of this
class place in the algorithms hierarchy.
// units conversion
#include
"MantidMDEvents/UnitsConversionHelper.h"
namespace
Mantid
{
namespace
MDEvents
{
/** class describes the interface to the methods, which perform conversion from
usual workspaces to MDEventWorkspace
*
* See http://www.mantidproject.org/Writing_custom_ConvertTo_MD_transformation
for detailed description of this
* class place in the algorithms hierarchy.
*
*
* @date 07-01-2012
@date 07-01-2012
Copyright © 2010 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
National Laboratory & European Spallation Source
This file is part of Mantid.
This file is part of Mantid.
Mantid is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
Mantid is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
Mantid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Mantid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.