refs #4401 Another piece of refactored code added

and hopefully works
mantidproject · Apr 25, 2012 · 0af0063 · 0af0063
1 parent 7656e46
commit 0af0063
Show file tree

Hide file tree

Showing 8 changed files with 829 additions and 826 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -67,7 +67,7 @@ set ( INC_FILES
 #	inc/MantidMDAlgorithms/ConvertToMDEventsHistoWS.h
 	inc/MantidMDAlgorithms/ConvertToMDEventsParams.h
 #	inc/MantidMDAlgorithms/ConvertToMDEventsSubalgFactory.h
-#	inc/MantidMDAlgorithms/ConvertToMDEventsTransfInterface.h
+	inc/MantidMDAlgorithms/ConvertToMDEventsTransfInterface.h
 #	inc/MantidMDAlgorithms/ConvertToMDEventsTransfModQ.h
 #	inc/MantidMDAlgorithms/ConvertToMDEventsTransfNoQ.h
 #	inc/MantidMDAlgorithms/ConvertToMDEventsTransfQ3D.h
@@ -116,11 +116,11 @@ set ( TEST_FILES
 	test/AndMDTest.h
 	test/BooleanBinaryOperationMDTest.h
 	test/CompareMDWorkspacesTest.h
+#	test/ConvertToDetectorFaceMDTest.h	
 #	test/ConvertEventsToMDEventsTest.h
-#	test/ConvertToDetectorFaceMDTest.h
 #	test/ConvertToMDEventsCoordTransfTest.h
 #	test/ConvertToMDEventsMethodsTest.h
-#	test/ConvertToMDEventsParamsTest.h
+	test/ConvertToMDEventsParamsTest.h
 #	test/ConvertToMDEventsSubalgFactoryTest.h
 #	test/ConvertToMDEventsTest.h
 	test/ConvertToMDEventsUnitsConvTest.h

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDPreprocDetectors.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDPreprocDetectors.h
@@ -1,7 +1,14 @@
 #ifndef H_CONV2_MDEVENTS_DET_INFO
 #define H_CONV2_MDEVENTS_DET_INFO
 /** This structure is the basis and temporary replacement for future subalgorithm, which calculates 
-   * matrix workspace with various precprocessed detectors parameters
+   * matrix workspace with various precprocessed detectors parameters.
+
+   * The lightweight class below contain 3D uint vectors, pointing to the positions of the detectors
+      This vector used to preprocess and catch the partial positions of the detectors in Q-space
+     to avoid repetative calculations, and (possibly) to write these data as part of the physical compression scheme
+     in a very common situation when the physical instrument does not change in all runs, contributed into MD workspace
+   
+
    * 
    * @date 22-12-2011
 
@@ -30,11 +37,6 @@
 #include "MantidKernel/V3D.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidAPI/Progress.h"
-  /** the lightweight class below contain 3D uint vectors, pointing to the positions of the detectors
-      This vector used to preprocess and catch the partial positions of the detectors in Q-space
-      to avoid repetative calculations, and (possibly) to write these data as part of the physical compression scheme
-      in a very common situation when the physical instrument does not change in all runs, contributed into MD workspace
-   */
 namespace Mantid
 {
 namespace MDAlgorithms

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsEventWS.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsEventWS.h
@@ -18,7 +18,7 @@
 #include "MantidMDEvents/MDEvent.h"
 
 #include "MantidMDAlgorithms/IConvertToMDEventsMethods.h"
-#include "MantidMDAlgorithms/ConvertToMDEventsDetInfo.h"
+#include "MantidMDAlgorithms/ConvToMDPreprocDetectors.h"
 #include "MantidMDAlgorithms/ConvertToMDEventsTransfNoQ.h"
 #include "MantidMDAlgorithms/ConvertToMDEventsTransfModQ.h"
 #include "MantidMDAlgorithms/ConvertToMDEventsTransfQ3D.h"
@@ -68,7 +68,7 @@ class ConvertToMDEventsWS<ConvertToMD::EventWSType,Q,MODE,CONV,Sample>: public I
      // vector to keep generic part of event coordinates
      std::vector<coord_t> Coord;
  public:
-    size_t  setUPConversion(Mantid::API::MatrixWorkspace_sptr pWS2D, const PreprocessedDetectors &detLoc,
+    size_t  setUPConversion(Mantid::API::MatrixWorkspace_sptr pWS2D, const ConvToMDPreprocDetectors &detLoc,
                           const MDEvents::MDWSDescription &WSD, boost::shared_ptr<MDEvents::MDEventWSWrapper> inWSWrapper)
     {
         size_t numSpec=IConvertToMDEventsMethods::setUPConversion(pWS2D,detLoc,WSD,inWSWrapper);

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsHistoWS.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsHistoWS.h
@@ -17,10 +17,10 @@
 #include "MantidMDEvents/MDEvent.h"
 
 #include "MantidMDAlgorithms/IConvertToMDEventsMethods.h"
-#include "MantidMDAlgorithms/ConvertToMDEventsDetInfo.h"
-#include "MantidMDAlgorithms/ConvertToMDEventsTransfNoQ.h"
-#include "MantidMDAlgorithms/ConvertToMDEventsTransfModQ.h"
-#include "MantidMDAlgorithms/ConvertToMDEventsTransfQ3D.h"
+#include "MantidMDAlgorithms/ConvToMDPreprocDetectors.h"
+//#include "MantidMDAlgorithms/ConvertToMDEventsTransfNoQ.h"
+//#include "MantidMDAlgorithms/ConvertToMDEventsTransfModQ.h"
+//#include "MantidMDAlgorithms/ConvertToMDEventsTransfQ3D.h"
 
 namespace Mantid
 {
@@ -68,7 +68,7 @@ class ConvertToMDEventsWS<ConvertToMD::Ws2DHistoType,Q,MODE,CONV,Sample>: public
      // not yet parallel
      virtual size_t conversionChunk(size_t job_ID){UNUSED_ARG(job_ID); return 0;}
 public:
-    size_t  setUPConversion(Mantid::API::MatrixWorkspace_sptr pWS2D, const PreprocessedDetectors &detLoc,
+    size_t  setUPConversion(Mantid::API::MatrixWorkspace_sptr pWS2D, const ConvToMDPreprocDetectors &detLoc,
                           const MDEvents::MDWSDescription &WSD, boost::shared_ptr<MDEvents::MDEventWSWrapper> inWSWrapper)
     {
         size_t numSpec=IConvertToMDEventsMethods::setUPConversion(pWS2D,detLoc,WSD,inWSWrapper);