diff --git a/Framework/DataHandling/src/LoadHelper.cpp b/Framework/DataHandling/src/LoadHelper.cpp index 126ae4bbd5d425ff0a3271179d74caea550f3e31..34882b1e247c039469cee5e6b16c438311f5fef0 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 cb3b9489f9260627fc86a490504b8cdbe4d35840..8aa73127a37efa2ef8cf6e99321c7ae89e82a91c 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