diff --git a/Code/Mantid/Framework/Algorithms/src/FilterByLogValue.cpp b/Code/Mantid/Framework/Algorithms/src/FilterByLogValue.cpp index 7922979756398b6622a59083a5d4e190070a3a4f..7e1e93220b803ed0b72aca2661d696bf362d9228 100644 --- a/Code/Mantid/Framework/Algorithms/src/FilterByLogValue.cpp +++ b/Code/Mantid/Framework/Algorithms/src/FilterByLogValue.cpp @@ -214,7 +214,6 @@ void FilterByLogValue::exec() - // for (int i=0; i < splitter.size(); i++) std::cout << splitter[i].start() << " to " << splitter[i].stop() << "\n"; } g_log.information() << splitter.size() << " entries in the filter.\n"; diff --git a/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h b/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h index f9cac9d51c930879da1ba8d3876e73a0d61fc659..f322c1515516f4219273c163121ae5ff2d6e90ec 100644 --- a/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h +++ b/Code/Mantid/Framework/Algorithms/test/FilterByLogValueTest.h @@ -318,8 +318,23 @@ public: // It has 5 entries, leaving 95 seconds of events do_test_fake("temp", 0, 0, 95, true, true /* in place*/, true /*PulseFilter*/); do_test_fake("temp", 0, 0, 95, true, false /* not in place*/, true /*PulseFilter*/); + // Filter on an entry with only one point + do_test_fake("single_middle", 0, 0, 99, true, false /* not in place*/, true /*PulseFilter*/); } +// // Very slow +// void xtest_HYSPEC() +// { +// FrameworkManager::Instance().exec("LoadEventNexus", 4, +// "OutputWorkspace", "hys_4333", +// "Filename", "HYS_4333_event.nxs"); +// FrameworkManager::Instance().exec("FilterByLogValue", 8, +// "InputWorkspace", "hys_4333", +// "OutputWorkspace", "hys_4333_veto", +// "LogName", "veto_pulse_time", +// "PulseFilter", "1"); +// } + private: std::string inputWS; diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexusLogs.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexusLogs.cpp index e69712cea40e2ad1f5e86ae35e19df5c27921431..a7824d7e178f55b6837c2aa6edccc0704dd8408b 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadNexusLogs.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadNexusLogs.cpp @@ -250,9 +250,8 @@ namespace Mantid file.getData(time_double); // Fake values with zeroes. - std::vector<int> values(time_double.size(), 0); - // Make an int TSP - TimeSeriesProperty<int> * tsp = new TimeSeriesProperty<int>("veto_pulse_time"); + std::vector<double> values(time_double.size(), 0.0); + TimeSeriesProperty<double> * tsp = new TimeSeriesProperty<double>("veto_pulse_time"); tsp->create(start, time_double, values); tsp->setUnits("");