Merge remote-tracking branch 'origin/feature/8613_loadeventnexus_empt…

…y_bank_failure'
mantidproject · Dec 13, 2013 · 0aac32d · 0aac32d
2 parents db0031b + 27cfa20
commit 0aac32d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -1425,11 +1425,6 @@ void LoadEventNexus::loadEvents(API::Progress * const prog, const bool monitors)
 
       // get the number of events
       std::size_t num = numEvents(file, hasTotalCounts, oldNeXusFileNames);
-      if (num == 0)
-      {
-        file.closeGroup();
-        continue;
-      }
       bankNames.push_back( entry_name );
       bankNumEvents.push_back(num);
       total_events += num;

diff --git a/Code/Mantid/Framework/DataHandling/test/LoadEventNexusTest.h b/Code/Mantid/Framework/DataHandling/test/LoadEventNexusTest.h
@@ -332,6 +332,24 @@ class LoadEventNexusTest : public CxxTest::TestSuite
     doTestSingleBank(false, false, "bankDoesNotExist", true);
   }
 
+  void test_SingleBank_with_no_events()
+  {
+    LoadEventNexus load;
+    TS_ASSERT_THROWS_NOTHING( load.initialize() );
+    TS_ASSERT_THROWS_NOTHING( load.setPropertyValue("Filename", "HYSA_12509.nxs.h5") );
+    TS_ASSERT_THROWS_NOTHING( load.setPropertyValue("BankName", "bank10") );
+    const std::string outws("AnEmptyWS");
+    TS_ASSERT_THROWS_NOTHING( load.setPropertyValue("OutputWorkspace", outws) );
+    if ( !load.execute() )
+    {
+      TS_FAIL("LoadEventNexus shouldn't fail to load an empty bank");
+      return;
+    }
+
+    auto ws = AnalysisDataService::Instance().retrieveWS<EventWorkspace>(outws);
+    TS_ASSERT_EQUALS( ws->getNumberEvents(), 0 );
+  }
+
   void test_instrument_inside_nexus_file()
   {
     LoadEventNexus load;