Remove IDataFileChecker & LoadAlgorithmFactory. Refs #7263

mantidproject · Jul 4, 2013 · 39bfe42 · 39bfe42
1 parent a5c9c30
commit 39bfe42
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 296 deletions.
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -39,7 +39,6 @@ set ( SRC_FILES
 	src/FunctionValues.cpp
 	src/GridDomain.cpp
 	src/GridDomain1D.cpp
-	src/IDataFileChecker.cpp
 	src/IDomainCreator.cpp
 	src/IEventList.cpp
 	src/IEventWorkspace.cpp
@@ -69,7 +68,6 @@ set ( SRC_FILES
 	src/JointDomain.cpp
 	src/LinearScale.cpp
 	src/LiveListenerFactory.cpp
-	src/LoadAlgorithmFactory.cpp
 	src/LocatedDataRef.cpp
 	src/LocatedDataValue.cpp
 	src/LogManager.cpp
@@ -172,7 +170,6 @@ set ( INC_FILES
 	inc/MantidAPI/ICatalog.h
 	inc/MantidAPI/IConstraint.h
 	inc/MantidAPI/ICostFunction.h
-	inc/MantidAPI/IDataFileChecker.h
 	inc/MantidAPI/IDataItem.h
 	inc/MantidAPI/IDomainCreator.h
 	inc/MantidAPI/IEventList.h
@@ -216,7 +213,6 @@ set ( INC_FILES
 	inc/MantidAPI/JointDomain.h
 	inc/MantidAPI/LinearScale.h
 	inc/MantidAPI/LiveListenerFactory.h
-	inc/MantidAPI/LoadAlgorithmFactory.h
 	inc/MantidAPI/LocatedDataRef.h
 	inc/MantidAPI/LocatedDataValue.h
 	inc/MantidAPI/LogManager.h

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IDataFileChecker.h b/Code/Mantid/Framework/API/inc/MantidAPI/IDataFileChecker.h
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/LoadAlgorithmFactory.h b/Code/Mantid/Framework/API/inc/MantidAPI/LoadAlgorithmFactory.h
diff --git a/Code/Mantid/Framework/API/src/IDataFileChecker.cpp b/Code/Mantid/Framework/API/src/IDataFileChecker.cpp
diff --git a/Code/Mantid/Framework/API/src/LoadAlgorithmFactory.cpp b/Code/Mantid/Framework/API/src/LoadAlgorithmFactory.cpp
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSEventNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSEventNexus.h
@@ -61,9 +61,6 @@ namespace Mantid
       virtual int version() const;
 	  /// category
 	  virtual const std::string category() const { return "Deprecated"; }
-
-      int fileCheck(const std::string& filePath);
-
     };
 
   } // namespace DataHandling

diff --git a/Code/Mantid/Framework/DataHandling/src/Load.cpp b/Code/Mantid/Framework/DataHandling/src/Load.cpp
@@ -38,7 +38,6 @@ Loading multiple files is also possible with <code>Load</code>, as well as works
 #include "MantidAPI/IEventWorkspace.h"
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidAPI/IWorkspaceProperty.h"
-#include "MantidAPI/LoadAlgorithmFactory.h"
 #include "MantidAPI/MultipleFileProperty.h"
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/FacilityInfo.h"

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSNSEventNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSNSEventNexus.cpp
@@ -6,7 +6,6 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidDataHandling/LoadSNSEventNexus.h"
-#include "MantidAPI/LoadAlgorithmFactory.h" // For the DECLARE_LOADALGORITHM macro
 
 using namespace ::NeXus;
 using namespace Mantid::Geometry;
@@ -17,9 +16,6 @@ namespace Mantid
 namespace DataHandling
 {
 
-DECLARE_ALGORITHM(LoadSNSEventNexus)
-//DECLARE_LOADALGORITHM(LoadSNSEventNexus)
-
 LoadSNSEventNexus::LoadSNSEventNexus()
 {
   this->useAlgorithm("LoadEventNexus");
@@ -36,16 +32,5 @@ const std::string LoadSNSEventNexus::name() const
   return "LoadSNSEventNexus";
 }
 
-/**
- * Checks the file by opening it and reading few lines
- *  @param filePath :: name of the file inluding its path
- *  @return an integer value how much this algorithm can load the file
- */
-int LoadSNSEventNexus::fileCheck(const std::string& filePath)
-{
-  UNUSED_ARG(filePath);
-  return 0;
-}
-
 } // namespace DataHandling
 } // namespace Mantid
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp
@@ -15,7 +15,6 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/Strings.h"
 #include "MantidAPI/AlgorithmFactory.h"
-#include "MantidAPI/LoadAlgorithmFactory.h"
 
 #include <boost/regex.hpp>
 #include <boost/shared_array.hpp>
@@ -44,6 +43,9 @@ namespace Mantid
 {
   namespace DataHandling
   {
+    // Register the algorithm into the AlgorithmFactory
+    DECLARE_FILELOADER_ALGORITHM(LoadSpice2D);
+
     // Parse string and convert to numeric type
     template <class T>
     bool from_string(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&))
@@ -94,10 +96,6 @@ namespace Mantid
       ws->getSpectrum(specID)->setSpectrumNo(specID);
     }
 
-
-    // Register the algorithm into the AlgorithmFactory
-    DECLARE_FILELOADER_ALGORITHM(LoadSpice2D);
-
     /**
      * Return the confidence with with this algorithm can load the file
      * @param descriptor A descriptor for the file

diff --git a/Code/Mantid/Framework/DataHandling/test/LoadSNSEventNexusTest.h b/Code/Mantid/Framework/DataHandling/test/LoadSNSEventNexusTest.h
@@ -19,19 +19,6 @@ class LoadSNSEventNexusTest : public CxxTest::TestSuite
 {
 public:
 
-  void test_fileCheck()
-  {
-    LoadSNSEventNexus ld;
-    ld.initialize();
-    ld.setPropertyValue("Filename","CNCS_7860_event.nxs"); // Only doing this to resolve the path to the file
-    TS_ASSERT_EQUALS(ld.fileCheck(ld.getPropertyValue("Filename")), 0);
-
-    //Try an ISIS nexus file
-    ld.setPropertyValue("Filename","LOQ49886.nxs");
-    TS_ASSERT_EQUALS(ld.fileCheck(ld.getPropertyValue("Filename")), 0);
-  }
-
-
   void test_Simple()
   {
     Mantid::API::FrameworkManager::Instance();

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/RawFileMemento.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/RawFileMemento.cpp
@@ -2,7 +2,6 @@
 #include "MantidKernel/Matrix.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/LoadAlgorithmFactory.h"
 #include "MantidGeometry/Crystal/OrientedLattice.h"
 #include <iostream>
 #include <fstream>