Skip to content

Commit c4d8ef5

Browse files
authored
Merge pull request mantidproject#36586 from mantidproject/backmari_load_event_nexus_next
ProcessBankData accidental else if
2 parents d92ec19 + be13e1a commit c4d8ef5

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

Framework/DataHandling/src/ProcessBankData.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ void ProcessBankData::run() {
189189
// tof limits from things observed here
190190
if (tof > my_longest_tof) {
191191
my_longest_tof = tof;
192-
} else if (tof < my_shortest_tof) {
192+
}
193+
if (tof < my_shortest_tof) {
193194
my_shortest_tof = tof;
194195
}
195196
} else

Framework/DataHandling/test/LoadEventNexusTest.h

+25
Original file line numberDiff line numberDiff line change
@@ -1057,6 +1057,31 @@ class LoadEventNexusTest : public CxxTest::TestSuite {
10571057
TS_ASSERT_EQUALS(eventWS->detectorInfo().size(), 921)
10581058
}
10591059

1060+
void test_monotonically_increasing_tofs() {
1061+
const std::string file = "CG2_monotonically_increasing_pulse_times.nxs.h5";
1062+
const std::string wsName = "dummy_for_child";
1063+
LoadEventNexus alg;
1064+
alg.setChild(true);
1065+
alg.setRethrows(true);
1066+
alg.initialize();
1067+
alg.setProperty("Filename", file);
1068+
alg.setProperty("OutputWorkspace", wsName);
1069+
alg.setProperty("NumberOfBins", 1);
1070+
alg.execute();
1071+
Workspace_sptr ws = alg.getProperty("OutputWorkspace");
1072+
auto eventWS = std::dynamic_pointer_cast<EventWorkspace>(ws);
1073+
TS_ASSERT(eventWS);
1074+
constexpr int expectedNumberEvents = 32494;
1075+
TS_ASSERT_EQUALS(eventWS->getNumberEvents(), expectedNumberEvents);
1076+
double sum = 0.0;
1077+
for (size_t i = 0; i < eventWS->getNumberHistograms(); ++i) {
1078+
TS_ASSERT_EQUALS(eventWS->readX(i).size(), 2)
1079+
sum += eventWS->readY(i)[0];
1080+
}
1081+
TS_ASSERT_DELTA(sum, expectedNumberEvents, 1e-6)
1082+
AnalysisDataService::Instance().remove(wsName);
1083+
}
1084+
10601085
private:
10611086
std::string wsSpecFilterAndEventMonitors;
10621087
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f2ded7e4ff34296a5f7b37d0b83952a5

0 commit comments

Comments
 (0)