diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt index d07e0d239d71d9b3f549b6b5772d0ea02b94563c..4178e57d4bba14fa521aef6657d9f12545e9ad10 100644 --- a/Code/Mantid/Framework/API/CMakeLists.txt +++ b/Code/Mantid/Framework/API/CMakeLists.txt @@ -182,7 +182,6 @@ set ( INC_FILES inc/MantidAPI/IFunctionMW.h inc/MantidAPI/IFunctionValues.h inc/MantidAPI/IFunctionWithLocation.h - inc/MantidAPI/IHDFFileLoader.h inc/MantidAPI/ILiveListener.h inc/MantidAPI/ILocatedData.h inc/MantidAPI/IMDEventWorkspace.h diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h b/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h index c982d2616f8db9c69bcefcd2dd657d63db057b5b..efee45e2c52d3708122fc39b4625d31aef60f4b4 100644 --- a/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h +++ b/Code/Mantid/Framework/API/inc/MantidAPI/FileLoaderRegistry.h @@ -3,7 +3,6 @@ #include "MantidAPI/AlgorithmFactory.h" #include "MantidAPI/IFileLoader.h" -#include "MantidAPI/IHDFFileLoader.h" #include "MantidKernel/SingletonHolder.h" #include <boost/type_traits/is_base_of.hpp> @@ -104,17 +103,17 @@ namespace Mantid switch(format) { case Nexus: - if(!boost::is_base_of<IHDFFileLoader,T>::value) + if(!boost::is_base_of<IFileLoader<Kernel::NexusDescriptor>,T>::value) { throw std::runtime_error(std::string("FileLoaderRegistryImpl::subscribe - Class '") + typeid(T).name() + - "' registered as Nexus loader but it does not inherit from Mantid::API::IHDFFileLoader"); + "' registered as Nexus loader but it does not inherit from API::IFileLoader<Kernel::NexusDescriptor>"); } break; case Generic: - if(!boost::is_base_of<IFileLoader,T>::value) + if(!boost::is_base_of<IFileLoader<Kernel::FileDescriptor>,T>::value) { throw std::runtime_error(std::string("FileLoaderRegistryImpl::subscribe - Class '") + typeid(T).name() + - "' registered as Generic loader but it does not inherit from Mantid::API::IFileLoader"); + "' registered as Generic loader but it does not inherit from API::IFileLoader<Kernel::FileDescriptor>"); } break; default: throw std::runtime_error("Invalid LoaderFormat given"); diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h index 99a7d276f3d00d923b92e1a522a4b37dfe7bd12b..f7a2ae647015a1df92137e599c4724848e86c037 100644 --- a/Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h +++ b/Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h @@ -3,6 +3,7 @@ #include "MantidAPI/Algorithm.h" #include "MantidKernel/FileDescriptor.h" +#include "MantidKernel/NexusDescriptor.h" namespace Mantid { @@ -33,13 +34,14 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ + template<typename DescriptorType> class MANTID_API_DLL IFileLoader : public Algorithm { public: /// Virtual destructor (required by linker on some versions of OS X/Intel compiler) virtual ~IFileLoader() {} /// Returns a confidence value that this algorithm can load a file - virtual int confidence(Kernel::FileDescriptor & descriptor) const = 0; + virtual int confidence(DescriptorType & descriptor) const = 0; }; } // namespace API diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IHDFFileLoader.h b/Code/Mantid/Framework/API/inc/MantidAPI/IHDFFileLoader.h deleted file mode 100644 index 04fedeb3c38b5d0388df3fbb4be81a600ccd38c0..0000000000000000000000000000000000000000 --- a/Code/Mantid/Framework/API/inc/MantidAPI/IHDFFileLoader.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef MANTID_API_IHDFFILELOADER_H_ -#define MANTID_API_IHDFFILELOADER_H_ - -#include "MantidAPI/Algorithm.h" -#include "MantidKernel/NexusDescriptor.h" - -namespace Mantid -{ - namespace API - { - /** - - Defines an interface to an algorithm that loads a file stored in a hierarchical data - format. This supports anything the NexusDescriptor can wrap, currently = NeXus, HDF5 - - Copyright © 2013 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory - - This file is part of Mantid. - - Mantid is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - Mantid is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - - File change history is stored at: <https://github.com/mantidproject/mantid> - Code Documentation is available at: <http://doxygen.mantidproject.org> - */ - class DLLExport IHDFFileLoader : public API::Algorithm - { - public: - /// Virtual destructor (required by linker on some versions of OS X/Intel compiler) - virtual ~IHDFFileLoader() {} - /// Returns a confidence value that this algorithm can load a file - virtual int confidence(Kernel::NexusDescriptor & descriptor) const = 0; - }; - - } // namespace API -} // namespace Mantid - -#endif /* MANTID_API_IHDFFILELOADER_H_ */ diff --git a/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp b/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp index d4a2d8e662c3c70261d64b25609a91d926d20bb0..11836e3632b2d60a7a0543260248259db61094c7 100644 --- a/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp +++ b/Code/Mantid/Framework/API/src/FileLoaderRegistry.cpp @@ -1,7 +1,5 @@ #include "MantidAPI/FileLoaderRegistry.h" #include "MantidAPI/IFileLoader.h" -#include "MantidAPI/IHDFFileLoader.h" -#include "MantidKernel/FileDescriptor.h" #include <Poco/File.h> @@ -95,12 +93,12 @@ namespace Mantid if(NexusDescriptor::isHDF(filename)) { m_log.debug() << filename << " looks like a Nexus file. Checking registered Nexus loaders\n"; - bestLoader = searchForLoader<NexusDescriptor,IHDFFileLoader>(filename, m_names[Nexus], m_log); + bestLoader = searchForLoader<NexusDescriptor,IFileLoader<NexusDescriptor>>(filename, m_names[Nexus], m_log); } else { m_log.debug() << "Checking registered non-HDF loaders\n"; - bestLoader = searchForLoader<FileDescriptor,IFileLoader>(filename, m_names[Generic], m_log); + bestLoader = searchForLoader<FileDescriptor,IFileLoader<FileDescriptor>>(filename, m_names[Generic], m_log); } if(!bestLoader) @@ -135,11 +133,11 @@ namespace Mantid IAlgorithm_sptr loader; if(nexus && NexusDescriptor::isHDF(filename)) { - loader = searchForLoader<NexusDescriptor,IHDFFileLoader>(filename, names, m_log); + loader = searchForLoader<NexusDescriptor,IFileLoader<NexusDescriptor> >(filename, names, m_log); } else { - loader = searchForLoader<FileDescriptor,IFileLoader>(filename, names, m_log); + loader = searchForLoader<FileDescriptor,IFileLoader<FileDescriptor>>(filename, names, m_log); } if(loader) return true; else return false; diff --git a/Code/Mantid/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h b/Code/Mantid/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h index 54039d27d8c3018cc9eab3cec348e44fdd9b0bdb..54f59f13897f39d38b0c6ab980eea81cb95fe4c6 100644 --- a/Code/Mantid/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h +++ b/Code/Mantid/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h @@ -16,7 +16,7 @@ namespace Crystal * @author Janik Zikovsky, SNS * @date 2011-03-07 15:22:11.897153 */ - class DLLExport LoadIsawPeaks : public API::IFileLoader + class DLLExport LoadIsawPeaks : public API::IFileLoader<Kernel::FileDescriptor> { public: LoadIsawPeaks(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h index e15ed8996f97ce3d7a0de0b85034fbd32b9d8bb9..9108cab0a0e61acb42f8bcb178987ec1b987aded 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h @@ -44,7 +44,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadAscii :public API::IFileLoader + class DLLExport LoadAscii :public API::IFileLoader<Kernel::FileDescriptor> { public: /// Default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h index c8fa693b399fd98e441aa3abb090b41b4d073fe1..bcc6fa12deacb79ae876731f1ff57a157e9f164c 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h @@ -53,7 +53,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadCanSAS1D : public API::IFileLoader + class DLLExport LoadCanSAS1D : public API::IFileLoader<Kernel::FileDescriptor> { public: ///default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h index 7048e83554954f864cea40b876f0dbcde32ab77a..229c5fa8e3b487b907d208fdbbbcd07caab7f11c 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h @@ -42,7 +42,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadDaveGrp : public API::IFileLoader +class DLLExport LoadDaveGrp : public API::IFileLoader<Kernel::FileDescriptor> { public: /// Constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h index 9a06e03c66677224871c900a0e265ab47ed02599..33af46b13d745a88ee975477bff69514ea585271 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h @@ -54,7 +54,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadEmptyInstrument : public API::IFileLoader + class DLLExport LoadEmptyInstrument : public API::IFileLoader<Kernel::FileDescriptor> { public: /// Default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h index ec4a821112c550a7a7671c2f93d1e7b5afc1860b..c8588ef5e8b298d260e3be55313537276523da95 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h @@ -4,7 +4,7 @@ //---------------------------------------------------------------------- // Includes //---------------------------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidDataObjects/EventWorkspace.h" #include <nexus/NeXusFile.hpp> #include <nexus/NeXusException.hpp> @@ -68,7 +68,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid> */ - class DLLExport LoadEventNexus : public API::IHDFFileLoader + class DLLExport LoadEventNexus : public API::IFileLoader<Kernel::NexusDescriptor> { public: /// Sets documentation strings for this algorithm diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h index 44995b590c384234dfb89768db757557c32d79de..432fee7eed393d4f24cf7b44037eca111d6ee6ed 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h @@ -96,7 +96,7 @@ struct Pulse #pragma pack(pop) -class DLLExport LoadEventPreNexus : public API::IFileLoader +class DLLExport LoadEventPreNexus : public API::IFileLoader<Kernel::FileDescriptor> { public: /// Constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h index 7c3a164b96c048b0882b665d760775b34d4c2fdb..7e8e345b96e3427fbeb930dc507521ba6c758341 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h @@ -96,7 +96,7 @@ struct Pulse #pragma pack(pop) -class DLLExport LoadEventPreNexus2 : public API::IFileLoader +class DLLExport LoadEventPreNexus2 : public API::IFileLoader<Kernel::FileDescriptor> { public: /// Constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h index 996724c3b2a01f2f7248bd0d5e188a8b41e920e1..7e3ac71f6d7b4a99a2ebd316e71868488c6e920b 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h @@ -36,7 +36,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadGSS : public API::IFileLoader +class DLLExport LoadGSS : public API::IFileLoader<Kernel::FileDescriptor> { public: /// (Empty) Constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h index 738cbec387f8c1d2b657c074cffba8db76cb6326..b46c2cc937fb27863e27e07c79f447609e37b949 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h @@ -4,7 +4,7 @@ //--------------------------------------------------- // Includes //--------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidNexus/NexusClasses.h" #include "MantidDataHandling/LoadHelper.h" @@ -39,9 +39,10 @@ namespace DataHandling { File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadILL: public API::IHDFFileLoader { -public: - /// Constructor + class DLLExport LoadILL: public API::IFileLoader<Kernel::NexusDescriptor> + { + public: + /// Constructor LoadILL(); /// Virtual destructor virtual ~LoadILL() { } diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h index 6a790253db517b0e57080260ece93c41342dca70..85e719374bd31d87596ea7438f697a2262c8dbda 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h @@ -2,7 +2,7 @@ #define MANTID_DATAHANDLING_LOADILLSANS_H_ #include "MantidKernel/System.h" -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidNexus/NexusClasses.h" #include "MantidDataHandling/LoadHelper.h" @@ -54,7 +54,7 @@ std::ostream& operator<<(std::ostream &strm, const DetectorPosition &p) { << p.shiftDown << std::endl; } -class DLLExport LoadILLSANS: public API::IHDFFileLoader { +class DLLExport LoadILLSANS: public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadILLSANS(); virtual ~LoadILLSANS(); @@ -63,7 +63,7 @@ public: virtual int version() const; virtual const std::string category() const; /// Returns a confidence value that this algorithm can load a file - int confidence(Kernel::HDFDescriptor & descriptor) const; + int confidence(Kernel::NexusDescriptor & descriptor) const; private: virtual void initDocs(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h index 54dcda3c82d6466b53f6d1865c1843e62d91579c..c50ed46fe8b717f79c29d48d7810f39e770e0cc4 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h @@ -5,7 +5,7 @@ // Includes //---------------------------------------------------------------------- #include "MantidAPI/Algorithm.h" -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidDataObjects/Workspace2D.h" #include "MantidDataHandling/ISISRunLogs.h" #include "MantidNexus/NexusClasses.h" @@ -67,7 +67,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadISISNexus2 : public API::IHDFFileLoader + class DLLExport LoadISISNexus2 : public API::IFileLoader<Kernel::NexusDescriptor> { public: /// Default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h index 4a920e74c4f5defb63e499e2e0e525471e998e90..d0649d402d172626c75d776ead4762ff27354126 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h @@ -2,7 +2,7 @@ #define MANTID_DATAHANDLING_LOADLLB_H_ #include "MantidKernel/System.h" -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidNexus/NexusClasses.h" #include "MantidDataHandling/LoadHelper.h" @@ -33,7 +33,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadLLB: public API::IHDFFileLoader { +class DLLExport LoadLLB: public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadLLB(); virtual ~LoadLLB(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasEventNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasEventNexus.h index 8af76af5f986332911e8b95e5027acf9ca3e2ebf..191be8b311af009880b89fc745a8855d4e270deb 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasEventNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasEventNexus.h @@ -3,7 +3,7 @@ #include "MantidKernel/System.h" #include "MantidAPI/Algorithm.h" -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" namespace Mantid { @@ -32,7 +32,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadMcStasEventNexus : public API::IHDFFileLoader + class DLLExport LoadMcStasEventNexus : public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadMcStasEventNexus(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h index 42320ad7fc653bf5355a99166696f3fa39aff859..e70b03800714558089b77f5c7576454a89c48c04 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h @@ -2,7 +2,7 @@ #define MANTID_DATAHANDLING_LOADMCSTASNEXUS_H_ #include "MantidKernel/System.h" -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" namespace Mantid { @@ -31,7 +31,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadMcStasNexus : public API::IHDFFileLoader + class DLLExport LoadMcStasNexus : public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadMcStasNexus(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h index ab06e9a1f73c1a3e0138b6d9ef323430c1a53478..eca3fbd35c8fd5d421d5b0a4ab33df26462fd219 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h @@ -4,7 +4,7 @@ //---------------------------------------------------------------------- // Includes //---------------------------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidDataObjects/Workspace2D.h" #include "MantidKernel/System.h" @@ -58,7 +58,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadMuonNexus : public API::IHDFFileLoader + class DLLExport LoadMuonNexus : public API::IFileLoader<Kernel::NexusDescriptor> { public: /// Default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h index 4c4d5c34944f50dbd0a4f4e61091bc0b57aa5025..bfd7aaff4d63b555e9742fba2d3a96299ce4a188 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h @@ -2,7 +2,7 @@ #define MANTID_DATAHANDLING_LOADNXSPE_H_ #include "MantidKernel/System.h" -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" namespace Mantid { @@ -38,7 +38,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadNXSPE : public API::IHDFFileLoader + class DLLExport LoadNXSPE : public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadNXSPE(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h index cf78b841c3990892a939940217e661adeb793f72..f18271d632551ac8fa5685605014d4ed95f77e9b 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h @@ -4,7 +4,7 @@ //---------------------------------------------------------------------- // Includes //---------------------------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidNexus/NexusClasses.h" #include <nexus/NeXusFile.hpp> @@ -47,7 +47,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadNexusProcessed : public API::IHDFFileLoader + class DLLExport LoadNexusProcessed : public API::IFileLoader<Kernel::NexusDescriptor> { public: diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h index 71cf00ddc5ba851c56d0c23b9e8437afb1d9ac9b..8be6353bf07d6f0c707c388eff9c0bbe5a3106d7 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h @@ -32,7 +32,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadPDFgetNFile : public API::IFileLoader + class DLLExport LoadPDFgetNFile : public API::IFileLoader<Kernel::FileDescriptor> { public: LoadPDFgetNFile(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h index d74cfd977c69f82cdcd0f8102a58ccf2462d7983..ebe58d57e4f5ed2013c101f3d46d593df1782b3e 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h @@ -36,7 +36,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadPreNexus : public API::IFileLoader + class DLLExport LoadPreNexus : public API::IFileLoader<Kernel::FileDescriptor> { public: LoadPreNexus(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h index 0f2a06bdc08ed82043f13535314dbe68f38a53f4..9a38c983e775d3eb01ac7ee53204e8f1ed90c308 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h @@ -4,7 +4,7 @@ //--------------------------------------------------- // Includes //--------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" namespace Mantid { @@ -37,7 +37,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadQKK : public API::IHDFFileLoader +class DLLExport LoadQKK : public API::IFileLoader<Kernel::NexusDescriptor> { public: /// (Empty) Constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h index 96fd84aa1c2e7b38fef56bdd24102ee1e7a791b5..9b2835e4a292f490b33d2a6f913860c3a41eae45 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h @@ -44,7 +44,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadRKH : public API::IFileLoader +class DLLExport LoadRKH : public API::IFileLoader<Kernel::FileDescriptor> { public: /// Constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h index 20c5214dcb71138ce5ee9feb4aea04c98efe76a3..614e849dbd2ecbb73edbd23a890cb1cd47d976e1 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h @@ -53,7 +53,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadRawHelper: public API::IFileLoader + class DLLExport LoadRawHelper: public API::IFileLoader<Kernel::FileDescriptor> { public: /// Default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSINQ.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSINQ.h index 8ff9bc03dd9bc9ee51e999c8e24f639bdfaa46e9..8b6429b20677b66942232f917b448a4e6f7c4112 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSINQ.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSINQ.h @@ -4,7 +4,7 @@ //--------------------------------------------------- // Includes //--------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidNexus/NexusClasses.h" #include "MantidDataHandling/LoadHelper.h" @@ -41,7 +41,7 @@ namespace DataHandling { File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadSINQ: public API::IHDFFileLoader +class DLLExport LoadSINQ: public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadSINQ(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h index 21bdaf08ba237ab52319eeb798a1f417ff61e5d2..b526678660b5134a6c6843af30a6b05609da50e5 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h @@ -44,7 +44,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadSNSspec : public API::IFileLoader + class DLLExport LoadSNSspec : public API::IFileLoader<Kernel::FileDescriptor> { public: LoadSNSspec(); diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h index 1eb4a9f3e18a4c347286d045fbf6eaf27faaa95c..48be9841516b6179a00d9c62d9a3afab3451a360 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h @@ -42,11 +42,11 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ -class DLLExport LoadSPE : public API::IFileLoader +class DLLExport LoadSPE : public API::IFileLoader<Kernel::FileDescriptor> { public: /// Constructor - LoadSPE() : API::IFileLoader() {} + LoadSPE() : API::IFileLoader<Kernel::FileDescriptor>() {} /// Virtual destructor virtual ~LoadSPE() {} /// Algorithm's name diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h index 92e42a29fb48eb06c8815719ac12e813aacffe0c..2afa1d3ed4ac1822286284f249443b8e81e5e696 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h @@ -4,7 +4,7 @@ //---------------------------------------------------------------------- // Includes //---------------------------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidAPI/WorkspaceGroup.h" #include "MantidDataObjects/Workspace2D.h" #include <hdf5.h> @@ -53,11 +53,11 @@ namespace Mantid }; */ - class DLLExport LoadSassena : public API::IHDFFileLoader + class DLLExport LoadSassena : public API::IFileLoader<Kernel::NexusDescriptor> { public: /// Constructor - LoadSassena(): API::IHDFFileLoader(), m_filename("") {}; + LoadSassena(): API::IFileLoader<Kernel::NexusDescriptor>(), m_filename("") {}; /// Virtual Destructor virtual ~LoadSassena() {} /// Algorithm's name diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h index b502ac37ea13c39aab98c91eb54804cfb3e88bc3..b2a91890f017e69a7382c5914b2ee1ad024e3f60 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h @@ -49,7 +49,7 @@ namespace Mantid File change history is stored at: <https://github.com/mantidproject/mantid>. Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadSpice2D : public API::IFileLoader + class DLLExport LoadSpice2D : public API::IFileLoader<Kernel::FileDescriptor> { public: ///default constructor diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h index f125785ecbf768ff3544eb80c1bd4d6cc9baa1a5..3c8a165cb70a34b8165248076cc6fbf0c581cb78 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h @@ -4,7 +4,7 @@ //---------------------------------------------------------------------- // Includes //---------------------------------------------------------------------- -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidAPI/Sample.h" #include "MantidAPI/SpectraDetectorTypes.h" #include "MantidDataObjects/Workspace2D.h" @@ -39,7 +39,7 @@ namespace DataHandling File change history is stored at: <https://github.com/mantidproject/mantid> */ -class DLLExport LoadTOFRawNexus : public API::IHDFFileLoader +class DLLExport LoadTOFRawNexus : public API::IFileLoader<Kernel::NexusDescriptor> { public: /// Default Constructor diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp index 748b2a93ce7db1f2a3c818dd830ce0714922f42a..60b98937363f85f8b4a571534415b3a8cf2199da 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp @@ -898,7 +898,7 @@ private: //=============================================================================================== /// Empty default constructor -LoadEventNexus::LoadEventNexus() : IHDFFileLoader(), +LoadEventNexus::LoadEventNexus() : IFileLoader<Kernel::NexusDescriptor>(), event_id_is_spec(false), m_allBanksPulseTimes(NULL) { } diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp index df9b49bc9b6139ba8b048736aeaa21109bf6c2d4..2bfa1081c55e9f6fc9a6419a2a4da4e40aa20ecf 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus.cpp @@ -102,7 +102,7 @@ static const double TOF_CONVERSION = .1; /// Conversion factor between picoColumbs and microAmp*hours static const double CURRENT_CONVERSION = 1.e-6 / 3600.; -LoadEventPreNexus::LoadEventPreNexus() : Mantid::API::IFileLoader(), eventfile(NULL), max_events(0) +LoadEventPreNexus::LoadEventPreNexus() : Mantid::API::IFileLoader<Kernel::FileDescriptor>(), eventfile(NULL), max_events(0) { } diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus2.cpp index eab4b22326610d3ee929911ca1f418a21b5b2728..6468108466e280752863194c8341d09e813925df 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus2.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNexus2.cpp @@ -215,7 +215,7 @@ int LoadEventPreNexus2::confidence(Kernel::FileDescriptor & descriptor) const /* * Constructor */ -LoadEventPreNexus2::LoadEventPreNexus2() : Mantid::API::IFileLoader(), eventfile(NULL), max_events(0) +LoadEventPreNexus2::LoadEventPreNexus2() : Mantid::API::IFileLoader<Kernel::FileDescriptor>(), eventfile(NULL), max_events(0) { } diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp index c21fccff3883dbc5c00ca82ce918c1c059e3fde2..ff26a72987814e010ad277a46cf05d522e4b01c8 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp @@ -80,7 +80,7 @@ void LoadILL::initDocs() { //--------------------------------------------------- LoadILL::LoadILL() : - API::IHDFFileLoader() { + API::IFileLoader<Kernel::NexusDescriptor>() { m_instrumentName = ""; m_wavelength = 0; diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h index 37cad7505f1217cfdb5bda3f16701dde18b08d27..842afdf16c35555757a0b729e399395ac10fa168 100644 --- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h +++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h @@ -1,7 +1,7 @@ #ifndef MANTID_MDEVENTS_LOADMD_H_ #define MANTID_MDEVENTS_LOADMD_H_ -#include "MantidAPI/IHDFFileLoader.h" +#include "MantidAPI/IFileLoader.h" #include "MantidAPI/IMDEventWorkspace.h" #include "MantidKernel/System.h" #include "MantidMDEvents/MDEventWorkspace.h" @@ -36,7 +36,7 @@ namespace MDAlgorithms File change history is stored at: <https://github.com/mantidproject/mantid> Code Documentation is available at: <http://doxygen.mantidproject.org> */ - class DLLExport LoadMD : public API::IHDFFileLoader + class DLLExport LoadMD : public API::IFileLoader<Kernel::NexusDescriptor> { public: LoadMD(); diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/LoadVTK.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/LoadVTK.h index a56d43b9dff41fe87cb70d443aff1674779e6033..9e6cfbde125b26465d2e68174a5c4665985a0eda 100644 --- a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/LoadVTK.h +++ b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/LoadVTK.h @@ -17,7 +17,7 @@ namespace Mantid } namespace VATES { - class DLLExport LoadVTK : public Mantid::API::IFileLoader + class DLLExport LoadVTK : public API::IFileLoader<Kernel::FileDescriptor> { public: virtual const std::string name() const; diff --git a/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp b/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp index e0753967c565da72bb98a35e43a05e3c3dbdbb3b..15a8b2cd1188b3a54794f709c4a26364658ec05a 100644 --- a/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/LoadVTK.cpp @@ -66,7 +66,7 @@ namespace Mantid { namespace VATES { - DECLARE_FILELOADER_ALGORITHM( LoadVTK) + DECLARE_FILELOADER_ALGORITHM(LoadVTK); /** * Return the confidence with with this algorithm can load the file