Merge remote-tracking branch 'origin/feature/9257_ccl_performance'

mantidproject · Apr 23, 2014 · 0e40cbb · 0e40cbb
2 parents fa6f239 + 5f0efa6
commit 0e40cbb
Show file tree

Hide file tree

Showing 75 changed files with 2,435 additions and 497 deletions.
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -88,6 +88,11 @@ set ( SRC_FILES
 	src/ParamFunction.cpp
 	src/ParameterReference.cpp
 	src/ParameterTie.cpp
+	src/PeakTransform.cpp
+	src/PeakTransformHKL.cpp
+	src/PeakTransformQLab.cpp
+	src/PeakTransformQSample.cpp
+	src/PeakTransformSelector.cpp
 	src/Progress.cpp
 	src/PropertyManagerDataService.cpp
 	src/PropertyNexus.cpp
@@ -144,6 +149,7 @@ set ( INC_FILES
 	inc/MantidAPI/CompositeDomain.h
 	inc/MantidAPI/CompositeDomainMD.h
 	inc/MantidAPI/CompositeFunction.h
+	inc/MantidAPI/ConcretePeakTransformFactory.h
 	inc/MantidAPI/ConstraintFactory.h
 	inc/MantidAPI/CoordTransform.h
 	inc/MantidAPI/CostFunctionFactory.h
@@ -235,6 +241,12 @@ set ( INC_FILES
 	inc/MantidAPI/ParamFunction.h
 	inc/MantidAPI/ParameterReference.h
 	inc/MantidAPI/ParameterTie.h
+	inc/MantidAPI/PeakTransform.h
+	inc/MantidAPI/PeakTransformFactory.h
+	inc/MantidAPI/PeakTransformHKL.h
+	inc/MantidAPI/PeakTransformQLab.h
+	inc/MantidAPI/PeakTransformQSample.h
+	inc/MantidAPI/PeakTransformSelector.h
 	inc/MantidAPI/Progress.h
 	inc/MantidAPI/PropertyManagerDataService.h
 	inc/MantidAPI/PropertyNexus.h
@@ -319,6 +331,10 @@ set ( TEST_FILES
 	ParamFunctionAttributeHolderTest.h
 	ParameterReferenceTest.h
 	ParameterTieTest.h
+	PeakTransformHKLTest.h
+	PeakTransformQLabTest.h
+	PeakTransformQSampleTest.h
+	PeakTransformSelectorTest.h
 	PropertyManagerDataServiceTest.h
 	PropertyNexusTest.h
 	RunTest.h

diff --git a/...liceViewer/ConcretePeakTransformFactory.h → .../MantidAPI/ConcretePeakTransformFactory.h b/...liceViewer/ConcretePeakTransformFactory.h → .../MantidAPI/ConcretePeakTransformFactory.h
@@ -1,12 +1,12 @@
-#ifndef MANTID_SLICEVIEWER_CONCRETEPEAKTRANSFORMFACTORY_H_
-#define MANTID_SLICEVIEWER_CONCRETEPEAKTRANSFORMFACTORY_H_
+#ifndef MANTID_API_CONCRETEPEAKTRANSFORMFACTORY_H_
+#define MANTID_API_CONCRETEPEAKTRANSFORMFACTORY_H_
 
-#include "MantidQtSliceViewer/PeakTransformFactory.h"
+#include "MantidAPI/PeakTransformFactory.h"
 #include <boost/make_shared.hpp>
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class ConcretePeakTransformFactory

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h
@@ -78,6 +78,9 @@ namespace API
     virtual double & operator [](const size_t & index) = 0;
 
     virtual void setCoordinateSystem(const Mantid::API::SpecialCoordinateSystem coordinateSystem) = 0;
+
+    virtual boost::shared_ptr<IMDHistoWorkspace> clone() const = 0;
+
   protected:
     virtual const std::string toString() const;
   };

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IMDIterator.h b/Code/Mantid/Framework/API/inc/MantidAPI/IMDIterator.h
@@ -119,6 +119,9 @@ class IMDWorkspace;
     /// Get the linear index.
     virtual size_t getLinearIndex() const = 0;
 
+    /// Is index reachable by the iterator.
+    virtual bool isWithinBounds(size_t index) const = 0;
+
   protected:
     /// Normalization method for getNormalizedSignal()
     Mantid::API::MDNormalization m_normalization;

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h
@@ -85,6 +85,8 @@ namespace API
 
     virtual size_t getLinearIndex() const;
 
+    virtual bool isWithinBounds(size_t index) const;
+
   private:
     void calcWorkspacePos(size_t newWI);
 

diff --git a/...r/inc/MantidQtSliceViewer/PeakTransform.h → ...amework/API/inc/MantidAPI/PeakTransform.h b/...r/inc/MantidQtSliceViewer/PeakTransform.h → ...amework/API/inc/MantidAPI/PeakTransform.h
@@ -1,15 +1,15 @@
-#ifndef MANTID_SLICEVIEWER_PEAKTRANSFORM_H_
-#define MANTID_SLICEVIEWER_PEAKTRANSFORM_H_
+#ifndef MANTID_API_PEAKTRANSFORM_H_
+#define MANTID_API_PEAKTRANSFORM_H_
 
 #include "MantidKernel/V3D.h"
 #include "MantidAPI/IPeak.h"
 #include <boost/regex.hpp>
 #include <boost/shared_ptr.hpp>
 #include "MantidAPI/SpecialCoordinateSystem.h"
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class PeakTransform
@@ -70,4 +70,4 @@ namespace MantidQt
   }
 }
 
-#endif /* MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTER_H_ */
+#endif /* MANTID_API_CONCRETEPEAKSPRESENTER_H_ */
diff --git a/...antidQtSliceViewer/PeakTransformFactory.h → .../API/inc/MantidAPI/PeakTransformFactory.h b/...antidQtSliceViewer/PeakTransformFactory.h → .../API/inc/MantidAPI/PeakTransformFactory.h
@@ -1,12 +1,12 @@
-#ifndef MANTID_SLICEVIEWER_PEAKTRANSFORMFACTORY_H_
-#define MANTID_SLICEVIEWER_PEAKTRANSFORMFACTORY_H_
+#ifndef MANTID_API_PEAKTRANSFORMFACTORY_H_
+#define MANTID_API_PEAKTRANSFORMFACTORY_H_
 
-#include "MantidQtSliceViewer/PeakTransform.h"
+#include "MantidAPI/PeakTransform.h"
 #include <boost/shared_ptr.hpp>
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class PeakTransformFactory
@@ -25,4 +25,4 @@ namespace MantidQt
   }
 }
 
-#endif
+#endif
diff --git a/...nc/MantidQtSliceViewer/PeakTransformHKL.h → ...work/API/inc/MantidAPI/PeakTransformHKL.h b/...nc/MantidQtSliceViewer/PeakTransformHKL.h → ...work/API/inc/MantidAPI/PeakTransformHKL.h
@@ -1,12 +1,12 @@
-#ifndef MANTID_SLICEVIEWER_PEAKTRANSFORMHKL_H_
-#define MANTID_SLICEVIEWER_PEAKTRANSFORMHKL_H_
+#ifndef MANTID_API_PEAKTRANSFORMHKL_H_
+#define MANTID_API_PEAKTRANSFORMHKL_H_
 
-#include "MantidQtSliceViewer/PeakTransform.h"
-#include "MantidQtSliceViewer/ConcretePeakTransformFactory.h"
+#include "MantidAPI/PeakTransform.h"
+#include "MantidAPI/ConcretePeakTransformFactory.h"
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class PeakTransformHKL
@@ -45,4 +45,4 @@ namespace MantidQt
   }
 }
 
-#endif /* MANTID_SLICEVIEWER_CONCRETEPEAKSPRESENTERHKL_H_ */
+#endif /* MANTID_API_CONCRETEPEAKSPRESENTERHKL_H_ */
diff --git a/...c/MantidQtSliceViewer/PeakTransformQLab.h → ...ork/API/inc/MantidAPI/PeakTransformQLab.h b/...c/MantidQtSliceViewer/PeakTransformQLab.h → ...ork/API/inc/MantidAPI/PeakTransformQLab.h
@@ -1,12 +1,12 @@
-#ifndef MANTID_SLICEVIEWER_PeakTransformQLab_H_
-#define MANTID_SLICEVIEWER_PeakTransformQLab_H_
+#ifndef MANTID_API_PeakTransformQLab_H_
+#define MANTID_API_PeakTransformQLab_H_
 
-#include "MantidQtSliceViewer/PeakTransform.h"
-#include "MantidQtSliceViewer/ConcretePeakTransformFactory.h"
+#include "MantidAPI/PeakTransform.h"
+#include "MantidAPI/ConcretePeakTransformFactory.h"
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class PeakTransformQLab
@@ -45,4 +45,4 @@ namespace MantidQt
   }
 }
 
-#endif /* MANTID_SLICEVIEWER_PeakTransformQLab_H_ */
+#endif /* MANTID_API_PeakTransformQLab_H_ */
diff --git a/...antidQtSliceViewer/PeakTransformQSample.h → .../API/inc/MantidAPI/PeakTransformQSample.h b/...antidQtSliceViewer/PeakTransformQSample.h → .../API/inc/MantidAPI/PeakTransformQSample.h
@@ -1,12 +1,12 @@
-#ifndef MANTID_SLICEVIEWER_PEAKTRANSFORMQSAMPLE_H_
-#define MANTID_SLICEVIEWER_PEAKTRANSFORMQSAMPLE_H_
+#ifndef MANTID_API_PEAKTRANSFORMQSAMPLE_H_
+#define MANTID_API_PEAKTRANSFORMQSAMPLE_H_
 
-#include "MantidQtSliceViewer/PeakTransform.h"
-#include "MantidQtSliceViewer/ConcretePeakTransformFactory.h"
+#include "MantidAPI/PeakTransform.h"
+#include "MantidAPI/ConcretePeakTransformFactory.h"
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class PeakTransformQSample
@@ -46,4 +46,4 @@ namespace MantidQt
   }
 }
 
-#endif /* MANTID_SLICEVIEWER_PEAKTRANSFORMQSAMPLE_H_ */
+#endif /* MANTID_API_PEAKTRANSFORMQSAMPLE_H_ */
diff --git a/...ntidQtSliceViewer/PeakTransformSelector.h → ...API/inc/MantidAPI/PeakTransformSelector.h b/...ntidQtSliceViewer/PeakTransformSelector.h → ...API/inc/MantidAPI/PeakTransformSelector.h
@@ -1,12 +1,12 @@
-#ifndef MANTID_SLICEVIEWER_PEAKTRANSFORMSELECTOR_H_
-#define MANTID_SLICEVIEWER_PEAKTRANSFORMSELECTOR_H_
+#ifndef MANTID_API_PEAKTRANSFORMSELECTOR_H_
+#define MANTID_API_PEAKTRANSFORMSELECTOR_H_
 
-#include "MantidQtSliceViewer/PeakTransformFactory.h"
+#include "MantidAPI/PeakTransformFactory.h"
 #include <set>
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /**
     @class PeakTransformSelector
@@ -41,4 +41,4 @@ namespace MantidQt
   }
 }
 
-#endif
+#endif
diff --git a/Code/Mantid/Framework/API/src/MatrixWorkspaceMDIterator.cpp b/Code/Mantid/Framework/API/src/MatrixWorkspaceMDIterator.cpp
@@ -316,6 +316,11 @@ namespace API
     throw std::runtime_error("MatrixWorkspaceMDIterator does not implement getLinearIndex");
   }
 
+  bool MatrixWorkspaceMDIterator::isWithinBounds(const size_t) const
+  {
+    throw std::runtime_error("MatrixWorkspaceMDIterator does not implement isWithinBounds");
+  }
+
 
 } // namespace Mantid
 } // namespace API
diff --git a/...antidQt/SliceViewer/src/PeakTransform.cpp → ...antid/Framework/API/src/PeakTransform.cpp b/...antidQt/SliceViewer/src/PeakTransform.cpp → ...antid/Framework/API/src/PeakTransform.cpp
@@ -1,8 +1,8 @@
-#include "MantidQtSliceViewer/PeakTransform.h"
+#include "MantidAPI/PeakTransform.h"
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
    PeakTransform::PeakTransform(const std::string& xPlotLabel, const std::string& yPlotLabel, const boost::regex& regexOne, const boost::regex& regexTwo, const boost::regex& regexThree) : 
     m_xPlotLabel(xPlotLabel),

diff --git a/...idQt/SliceViewer/src/PeakTransformHKL.cpp → ...id/Framework/API/src/PeakTransformHKL.cpp b/...idQt/SliceViewer/src/PeakTransformHKL.cpp → ...id/Framework/API/src/PeakTransformHKL.cpp
@@ -1,11 +1,11 @@
-#include "MantidQtSliceViewer/PeakTransformHKL.h"
+#include "MantidAPI/PeakTransformHKL.h"
 #include <boost/make_shared.hpp>
 
 using boost::regex;
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
 
   PeakTransformHKL::PeakTransformHKL() : PeakTransform("H", "K", regex("^(H.*)|(\\[H,0,0\\].*)$"), regex("^(K.*)|(\\[0,K,0\\].*)$"), regex("^(L.*)|(\\[0,0,L\\].*)$") )

diff --git a/...dQt/SliceViewer/src/PeakTransformQLab.cpp → ...d/Framework/API/src/PeakTransformQLab.cpp b/...dQt/SliceViewer/src/PeakTransformQLab.cpp → ...d/Framework/API/src/PeakTransformQLab.cpp
@@ -1,11 +1,11 @@
-#include "MantidQtSliceViewer/PeakTransformQLab.h"
+#include "MantidAPI/PeakTransformQLab.h"
 #include <boost/make_shared.hpp>
 
 using boost::regex;
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
 
   PeakTransformQLab::PeakTransformQLab() : PeakTransform("Q_lab_x", "Q_lab_y", regex("^Q_lab_x.*$"), regex("^Q_lab_y.*$"), regex("^Q_lab_z.*$") )

diff --git a/.../SliceViewer/src/PeakTransformQSample.cpp → ...ramework/API/src/PeakTransformQSample.cpp b/.../SliceViewer/src/PeakTransformQSample.cpp → ...ramework/API/src/PeakTransformQSample.cpp
@@ -1,11 +1,11 @@
-#include "MantidQtSliceViewer/PeakTransformQSample.h"
+#include "MantidAPI/PeakTransformQSample.h"
 #include <boost/make_shared.hpp>
 
 using boost::regex;
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
 
   PeakTransformQSample::PeakTransformQSample() : PeakTransform("Q_sample_x", "Q_sample_y", regex("^Q_sample_x.*$"), regex("^Q_sample_y.*$"), regex("^Q_sample_z.*$") )

diff --git a/...SliceViewer/src/PeakTransformSelector.cpp → ...amework/API/src/PeakTransformSelector.cpp b/...SliceViewer/src/PeakTransformSelector.cpp → ...amework/API/src/PeakTransformSelector.cpp
@@ -1,9 +1,9 @@
-#include "MantidQtSliceViewer/PeakTransformSelector.h"
+#include "MantidAPI/PeakTransformSelector.h"
 #include <stdexcept>
 
-namespace MantidQt
+namespace Mantid
 {
-  namespace SliceViewer
+  namespace API
   {
     /// Constructor
     PeakTransformSelector::PeakTransformSelector()