diff --git a/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp b/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp index c3ec47cea7b9d66c6ca357b535a006c7eeac8880..58d51fbd9d94f78495936d60fefb4fdef7e42c9d 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadInstrument.cpp @@ -134,7 +134,7 @@ namespace Mantid const std::string::size_type stripPath = m_filename.find_last_of("\\/"); std::string instrumentFile = m_filename.substr(stripPath+1,m_filename.size()); // Strip off "_Definition.xml" - m_instName = instrumentFile.substr(0,instrumentFile.find_first_of("_")); + m_instName = instrumentFile.substr(0,instrumentFile.find("_Def")); } // Load the XML text into a string diff --git a/Code/Mantid/Framework/DataHandling/test/LoadTOFRawNexusTest.h b/Code/Mantid/Framework/DataHandling/test/LoadTOFRawNexusTest.h index 105a3fb786e2ebc529a0f68d42dd8ca139e13783..9753acbeb6399b0d1d36561af832cfd4f9a31881 100644 --- a/Code/Mantid/Framework/DataHandling/test/LoadTOFRawNexusTest.h +++ b/Code/Mantid/Framework/DataHandling/test/LoadTOFRawNexusTest.h @@ -58,7 +58,7 @@ public: ); TS_ASSERT(ws); if (!ws) return; TS_ASSERT_EQUALS(ws->blocksize(), 501); - TS_ASSERT_EQUALS(ws->getInstrument()->getName(), "REF"); + TS_ASSERT_EQUALS(ws->getInstrument()->getName(), "REF_L"); TS_ASSERT_EQUALS(ws->getNumberHistograms(), 77824); ISpectrum * spec = ws->getSpectrum(27955);