diff --git a/Framework/MDAlgorithms/src/LoadDNSSCD.cpp b/Framework/MDAlgorithms/src/LoadDNSSCD.cpp index 4107db86528cca9b88698d8a2df445c3e6ceee50..f4f103a835de8e73431b77d5cec2517f502f57cf 100644 --- a/Framework/MDAlgorithms/src/LoadDNSSCD.cpp +++ b/Framework/MDAlgorithms/src/LoadDNSSCD.cpp @@ -553,10 +553,10 @@ void LoadDNSSCD::fillOutputWorkspace(double wavelength) { } detid_t detid(ds.detID[i]); double theta = 0.5 * (ds.detID[i] * 5.0 - ds.deterota) * deg2rad; - size_t nchannels = ds.signal[i].size(); + int64_t nchannels = static_cast<int64_t>(ds.signal[i].size()); if ((theta > theta_min) && (theta < theta_max)) { PARALLEL_FOR_IF(Kernel::threadSafe(*m_OutWS, *normWS)) - for (size_t channel = 0; channel < nchannels; channel++) { + for (auto channel = 0; channel < nchannels; channel++) { PARALLEL_START_INTERUPT_REGION double signal = ds.signal[i][channel]; signal_t error = std::sqrt(signal); diff --git a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h index f3a0080c0b7f290100cb56a60781f6e650a2acad..0455f64d2ad114ab5f6ff3b2728ae2b5f98e2630 100644 --- a/Framework/MDAlgorithms/test/LoadDNSSCDTest.h +++ b/Framework/MDAlgorithms/test/LoadDNSSCDTest.h @@ -25,7 +25,7 @@ using namespace Mantid::API; using namespace Mantid::DataObjects; using namespace Mantid::MDAlgorithms; -bool cmp_Events(std::vector<coord_t> &ev1, std::vector<coord_t> &ev2) { +bool cmp_Events(const std::vector<coord_t> &ev1, const std::vector<coord_t> &ev2) { // event1 < event2 if it has smaller det_id and dE assert(ev1.size() == 8); assert(ev2.size() == 8); diff --git a/docs/source/release/v3.14.0/direct_inelastic.rst b/docs/source/release/v3.14.0/direct_inelastic.rst index f518ed0199701ebdcb7ad8a55f185e4f2be21ab4..499d0f8156b6b9a001d7a910521d5d3ed11bbb9a 100644 --- a/docs/source/release/v3.14.0/direct_inelastic.rst +++ b/docs/source/release/v3.14.0/direct_inelastic.rst @@ -11,3 +11,8 @@ Direct Inelastic Changes :ref:`Release 3.14.0 <v3.14.0>` + +Improvements +############ + +- :ref:`LoadDNSSCD <LoadDNSSCD>` has been improved to be able to load TOF data.