refs #4401 Enabled everything disabled before.

Should be in working order now.
mantidproject · Apr 25, 2012 · b38a654 · b38a654
1 parent 3c330d7
commit b38a654
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -125,7 +125,7 @@ set ( TEST_FILES
 	test/ConvertToMDEventsTest.h
 	test/ConvertToMDEventsUnitsConvTest.h
 	test/ConvertToQ3DdETest.h
-	test/ConvertToMDEventsTestPerformance.h 	
+#	test/ConvertToMDEventsTestPerformance.h 	
 	test/DivideMDTest.h
 	test/EqualToMDTest.h
 	test/ExponentialMDTest.h

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IConvertToMDEventsWS.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IConvertToMDEventsWS.h
@@ -134,19 +134,20 @@ namespace MDAlgorithms
 
 
 /// Templated interface to the workspace conversion algorithm. Every template parameter refers to different conversion possibilities
+/// the template itself should not be instanciated
 template<ConvertToMD::InputWSType WS,ConvertToMD::QMode Q, ConvertToMD::AnalMode MODE, ConvertToMD::CnvrtUnits CONV,ConvertToMD::SampleType Sample>
 class ConvertToMDEventsWS: public IConvertToMDEventsWS 
 { 
 public:
     ConvertToMDEventsWS(){};
     /**templated virtual function to set up conversion*/
-    size_t setUPConversion(Mantid::API::MatrixWorkspace_sptr , ConvToMDPreprocDetectors &,const MDEvents::MDWSDescription &, boost::shared_ptr<MDEvents::MDEventWSWrapper> )
-    {return 0;}
+    size_t setUPConversion(Mantid::API::MatrixWorkspace_sptr , ConvToMDPreprocDetectors &,const MDEvents::MDWSDescription &, boost::shared_ptr<MDEvents::MDEventWSWrapper> );
+  //  {return 0;}
     /**templated virtual function to run conversion itself*/
-    void runConversion(API::Progress *){};
+    void runConversion(API::Progress *); //{};
 private:
     /**templated virtual function to run conversion chunk */
-    virtual size_t conversionChunk(size_t job_ID){return 0;}
+    virtual size_t conversionChunk(size_t job_ID); //{return 0;}
 };
 
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -1,7 +1,7 @@
 set ( SRC_FILES
     src/ConvertToEnergy.cpp
-#	src/CreateMDWorkspace.cpp
-#	src/CreateMDWorkspaceAlgDialog.cpp	
+	src/CreateMDWorkspace.cpp
+	src/CreateMDWorkspaceAlgDialog.cpp	
 	src/EventNexusFileMemento.cpp
 	src/Homer.cpp
 	src/IO_MuonGrouping.cpp
@@ -29,8 +29,8 @@ set ( SRC_FILES
 set ( INC_FILES
 	inc/MantidQtCustomInterfaces/Background.h
 	inc/MantidQtCustomInterfaces/ConvertToEnergy.h
-#	inc/MantidQtCustomInterfaces/CreateMDWorkspace.h
-#    inc/MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.h
+	inc/MantidQtCustomInterfaces/CreateMDWorkspace.h
+    inc/MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.h
 	inc/MantidQtCustomInterfaces/EventNexusFileMemento.h	
 	inc/MantidQtCustomInterfaces/Homer.h
 	inc/MantidQtCustomInterfaces/IO_MuonGrouping.h
@@ -58,8 +58,8 @@ set ( SRC_UNITY_IGNORE_FILES )
 
 set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
                 inc/MantidQtCustomInterfaces/ConvertToEnergy.h
-#                inc/MantidQtCustomInterfaces/CreateMDWorkspace.h
-#                inc/MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.h
+                inc/MantidQtCustomInterfaces/CreateMDWorkspace.h
+                inc/MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.h
                 inc/MantidQtCustomInterfaces/Homer.h
                 inc/MantidQtCustomInterfaces/Indirect.h
                 inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h
@@ -75,8 +75,8 @@ set ( MOC_FILES inc/MantidQtCustomInterfaces/Background.h
 )
 
 set ( UI_FILES inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
-#               inc/MantidQtCustomInterfaces/CreateMDWorkspace.ui
-#               inc/MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.ui
+               inc/MantidQtCustomInterfaces/CreateMDWorkspace.ui
+               inc/MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.ui
                inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
                inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.ui
                inc/MantidQtCustomInterfaces/MuonAnalysis.ui