diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h index 8995cb75fd8523479dd85f947d1873c7ed85ed1d..134809d2757324a1e06eb5ab96e667ced139839e 100644 --- a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h +++ b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h @@ -86,7 +86,7 @@ protected: double m_tofMax; // methods - virtual void endOfFrameImpl() ; + virtual void endOfFrameImpl(); virtual void addEventImpl(size_t id, double tof); public: diff --git a/Framework/DataHandling/src/LoadBBY.cpp b/Framework/DataHandling/src/LoadBBY.cpp index eb3dc4803a565550a45795c8c974167b3f55109c..010a2e938d908f3b6af7deea60beb2749e24bed3 100644 --- a/Framework/DataHandling/src/LoadBBY.cpp +++ b/Framework/DataHandling/src/LoadBBY.cpp @@ -304,8 +304,8 @@ void LoadBBY::exec() { eventList.setSortOrder(DataObjects::PULSETIME_SORT); eventList.reserve(eventCounts[i]); - eventList.setDetectorID(i); - eventList.setSpectrumNo(i); + eventList.setDetectorID(Mantid::detid_t(i)); + eventList.setSpectrumNo(Mantid::detid_t(i)); DataObjects::getEventsFrom(eventList, eventVectors[i]); @@ -361,12 +361,12 @@ void LoadBBY::exec() { // currently beam monitor counts are not available, instead number of frames // times period is used logManager.addProperty( - "bm_counts", eventCounter.numFrames() * period / + "bm_counts", static_cast<double>(eventCounter.numFrames()) * period / 1.0e6); // static_cast<double>(instrumentInfo.bm_counts) // currently Kernel::time_duration duration = boost::posix_time::microseconds( - static_cast<boost::int64_t>(eventCounter.numFrames() * period)); + static_cast<boost::int64_t>(static_cast<double>(eventCounter.numFrames()) * period)); Kernel::DateAndTime start_time("2000-01-01T00:00:00"); Kernel::DateAndTime end_time(start_time + duration);