From a343fe5bfd9e4cbb225e620be06ab263380d919d Mon Sep 17 00:00:00 2001
From: Gagik Vardanyan <vardanyan@ill.fr>
Date: Tue, 16 May 2017 17:33:08 +0200
Subject: [PATCH] Re #19009 full nx class name comparison
---
Framework/DataHandling/src/LoadHelper.cpp | 3 +--
Framework/Kernel/src/NexusDescriptor.cpp | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Framework/DataHandling/src/LoadHelper.cpp b/Framework/DataHandling/src/LoadHelper.cpp
index 126ae4bbd5d..34882b1e247 100644
--- a/Framework/DataHandling/src/LoadHelper.cpp
+++ b/Framework/DataHandling/src/LoadHelper.cpp
@@ -11,7 +11,6 @@
#include <nexus/napi.h>
-#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp> //assert(boost::algorithm::ends_with("mystring", "ing"));
namespace Mantid {
@@ -211,7 +210,7 @@ void LoadHelper::recurseAndAddNexusFieldsToWsRun(NXhandle nxfileID,
if ((opengroup_status = NXopengroup(nxfileID, nxname, nxclass)) ==
NX_OK) {
- if (!boost::algorithm::contains(std::string(nxclass), "ILL")) {
+ if (std::string(nxclass) != "ILL_data_scan_vars")) {
// Go down to one level, if the group is known to nexus
std::string p_nxname(
diff --git a/Framework/Kernel/src/NexusDescriptor.cpp b/Framework/Kernel/src/NexusDescriptor.cpp
index cb3b9489f92..8aa73127a37 100644
--- a/Framework/Kernel/src/NexusDescriptor.cpp
+++ b/Framework/Kernel/src/NexusDescriptor.cpp
@@ -249,7 +249,7 @@ void NexusDescriptor::walkFile(::NeXus::File &file, const std::string &rootPath,
const std::string &entryClass = it->second;
const std::string entryPath =
std::string(rootPath).append("/").append(entryName);
- if (entryClass == "SDS" || boost::algorithm::contains(entryClass, "ILL")) {
+ if (entryClass == "SDS" || entryClass == "ILL_data_scan_vars") {
pmap.emplace(entryPath, entryClass);
} else if (entryClass == "CDF0.0") {
// Do nothing with this
--
GitLab