Skip to content
Snippets Groups Projects
Commit 56bdf6ac authored by Owen Arnold's avatar Owen Arnold
Browse files

NexusGeometryParser to namespace not class

parent b36814d6
No related branches found
No related tags found
No related merge requests found
...@@ -33,11 +33,10 @@ namespace NexusGeometry { ...@@ -33,11 +33,10 @@ namespace NexusGeometry {
File change history is stored at: <https://github.com/mantidproject/mantid> File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org> Code Documentation is available at: <http://doxygen.mantidproject.org>
*/ */
class DLLExport NexusGeometryParser { namespace NexusGeometryParser {
public: DLLExport std::unique_ptr<const Mantid::Geometry::Instrument>
std::unique_ptr<const Mantid::Geometry::Instrument> createInstrument(const std::string &fileName);
createInstrument(const std::string &fileName) const; } // namespace NexusGeometryParser
};
} // namespace NexusGeometry } // namespace NexusGeometry
} // namespace Mantid } // namespace Mantid
......
...@@ -536,7 +536,7 @@ extractInstrument(const H5File &file, const Group &root) { ...@@ -536,7 +536,7 @@ extractInstrument(const H5File &file, const Group &root) {
} // namespace } // namespace
std::unique_ptr<const Geometry::Instrument> std::unique_ptr<const Geometry::Instrument>
NexusGeometryParser::createInstrument(const std::string &fileName) const { NexusGeometryParser::createInstrument(const std::string &fileName) {
const H5File file(fileName, H5F_ACC_RDONLY); const H5File file(fileName, H5F_ACC_RDONLY);
auto rootGroup = file.openGroup("/"); auto rootGroup = file.openGroup("/");
......
...@@ -27,8 +27,7 @@ public: ...@@ -27,8 +27,7 @@ public:
const auto fullpath = Kernel::ConfigService::Instance().getFullPath( const auto fullpath = Kernel::ConfigService::Instance().getFullPath(
nexusFilename, true, Poco::Glob::GLOB_DEFAULT); nexusFilename, true, Poco::Glob::GLOB_DEFAULT);
NexusGeometryParser parser; return NexusGeometryParser::createInstrument(fullpath);
return parser.createInstrument(fullpath);
} }
std::unique_ptr<Geometry::DetectorInfo> extractDetectorInfo() { std::unique_ptr<Geometry::DetectorInfo> extractDetectorInfo() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment