Working version of new vesuvio loader. Refs #6207

mantidproject · Nov 22, 2012 · 23695a4 · 23695a4
1 parent 10dc7fc
commit 23695a4
Show file tree

Hide file tree

Showing 5 changed files with 770 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -377,7 +377,7 @@ set ( PLUGINS "." )
 set ( PV_PLUGINS "./pvplugins" )
 set ( IGNORE_PARAVIEW "0" )
 set ( QTPLUGINS "." )
-set ( PYTHONALGS ${MANTID_ROOT}/Framework/PythonAPI/PythonAlgorithms )
+set ( PYTHONALGS "${MANTID_ROOT}/Framework/PythonAPI/PythonAlgorithms;${MANTID_ROOT}/Framework/PythonInterface/PythonAlgorithms" )
 set ( DATADIRS ${MANTID_ROOT}/../../Test/AutoTestData;${MANTID_ROOT}/instrument )
 set ( COLORMAPS_FOLDER ${MANTID_ROOT}/Installers/colormaps/ )
 

diff --git a/Code/Mantid/Framework/PythonInterface/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/CMakeLists.txt
@@ -138,6 +138,7 @@ set ( TEST_PY_FILES
   test/python/WorkspaceGroupTest.py
   test/python/WorkspacePropertiesTest.py
   test/python/WorkspaceValidatorsTest.py
+  PythonAlgorithms/test/LoadVesuvioTest.py
 )
 
 set ( PYTEST_HELPERS test/python/testhelpers.py )