Revert "Re #8943. Moving newly exposed IMaskWorkspace into python."

This reverts commit 4f22e68. IMaskWorkspace does not derive from MatrixWorkspace.
mantidproject · Apr 3, 2014 · 2871bf1 · 2871bf1
1 parent 4f22e68
commit 2871bf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -33,8 +33,8 @@ set ( EXPORT_FILES
   src/Exports/IMDHistoWorkspace.cpp
   src/Exports/IMDHistoWorkspaceProperty.cpp  
   src/Exports/IMDEventWorkspace.cpp
-  src/Exports/MatrixWorkspace.cpp
   src/Exports/IMaskWorkspace.cpp
+  src/Exports/MatrixWorkspace.cpp
   src/Exports/MatrixWorkspaceProperty.cpp
   src/Exports/IEventWorkspace.cpp
   src/Exports/IEventWorkspaceProperty.cpp

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMaskWorkspace.cpp
@@ -1,22 +1,15 @@
 #include "MantidAPI/IMaskWorkspace.h"
-#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidPythonInterface/kernel/Registry/DataItemInterface.h"
 #include <boost/python/class.hpp>
 
 using Mantid::API::IMaskWorkspace;
 using Mantid::API::IMaskWorkspace_sptr;
-using Mantid::API::MatrixWorkspace;
 using namespace boost::python;
-namespace Registry = Mantid::PythonInterface::Registry;
 
 /** Python exports of the Mantid::API::IMaskWorkspace class. */
 void export_IMaskWorkspace()
 {
-  class_<IMaskWorkspace, bases<MatrixWorkspace>, boost::noncopyable>("IMaskWorkspace", no_init)
+  class_<IMaskWorkspace, boost::noncopyable>("IMaskWorkspace", no_init)
       .def("getNumberMasked", &IMaskWorkspace::getNumberMasked, args("self"),
            "Total number of masked pixels")
       ;
-
-  Registry::DataItemInterface<IMaskWorkspace> entry;
-  entry.castFromID("MaskWorkspace");
 }
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -239,10 +239,10 @@ void export_MatrixWorkspace()
 
   //-------------------------------------------------------------------------------------------------
 
-  static const int NUM_IDS = 9;
+  static const int NUM_IDS = 10;
   static const char * WORKSPACE_IDS[NUM_IDS] = {\
       "CompressedWorkspace2D", "GroupingWorkspace", "ManagedWorkspace2D",
-      "ManagedRawFileWorkspace2D", "OffsetsWorkspace",
+      "ManagedRawFileWorkspace2D", "MaskWorkspace", "OffsetsWorkspace",
       "RebinnedOutput", "SpecialWorkspace2D", "Workspace2D", "WorkspaceSingleValue"
   };