Commit 7a2b41dd authored by LamarMoore's avatar LamarMoore Committed by Lamar Moore
Browse files

Updated codebase with new TofEvent

parent b833d9aa
......@@ -269,8 +269,8 @@ void CalculateCountRate::calcRateLog(
double dt = (dTRangeMax - dTRangeMin) / static_cast<double>(m_numLogSteps);
auto t0 = m_TRangeMin.totalNanoseconds();
for (auto i = 0; i < m_numLogSteps; i++) {
times[i] =
Mantid::Types::DateAndTime(t0 + static_cast<int64_t>((0.5 + double(i)) * dt));
times[i] = Mantid::Types::DateAndTime(
t0 + static_cast<int64_t>((0.5 + double(i)) * dt));
}
// store calculated values within the target log.
targLog->replaceValues(times, countRate);
......
......@@ -6,7 +6,6 @@
#endif
#include "MantidAPI/MatrixWorkspace_fwd.h" // get MantidVec declaration
#include "MantidKernel/System.h"
#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/TimeSplitter.h"
#include "MantidKernel/cow_ptr.h"
#include "MantidTypes/DateAndTime.h"
......@@ -182,7 +181,9 @@ inline double WeightedEventNoTime::tof() const { return m_tof; }
/** Return the pulse time; this returns 0 since this
* type of Event has no time associated.
*/
inline Mantid::Types::DateAndTime WeightedEventNoTime::pulseTime() const { return 0; }
inline Mantid::Types::DateAndTime WeightedEventNoTime::pulseTime() const {
return 0;
}
/// Return the weight of the neutron, as a double (it is saved as a float).
inline double WeightedEventNoTime::weight() const { return m_weight; }
......
......@@ -4,6 +4,17 @@
#include "MantidTypes/DateAndTime.h"
namespace Mantid {
namespace DataObjects {
class EventList;
class WeightedEvent;
class WeightedEventNoTime;
class tofGreaterOrEqual;
class tofGreater;
} // namespace DataObjects
namespace DataHandling {
class LoadEventNexus;
}
namespace Types {
//==========================================================================================
/** Info about a single neutron detection event:
......@@ -15,14 +26,14 @@ namespace Types {
class _declspec(dllexport) TofEvent {
/// EventList has the right to mess with TofEvent.
friend class EventList;
friend class WeightedEvent;
friend class WeightedEventNoTime;
friend class tofGreaterOrEqual;
friend class tofGreater;
friend class DataHandling::LoadEventNexus; // Needed while the ISIS hack of
// spreading events out in a bin
// remains
friend class Mantid::DataObjects::EventList;
friend class Mantid::DataObjects::WeightedEvent;
friend class Mantid::DataObjects::WeightedEventNoTime;
friend class Mantid::DataObjects::tofGreaterOrEqual;
friend class Mantid::DataObjects::tofGreater;
friend class Mantid::DataHandling::LoadEventNexus; // Needed while the ISIS
// hack of spreading events
// out in a bin remains
protected:
/** The 'x value' of the event. This will be in a unit available from the
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment