From b833d9aa7628e34dc15cc2940a395efcc7e53ac2 Mon Sep 17 00:00:00 2001
From: LamarMoore <lamar.moore@stfc.ac.uk>
Date: Fri, 15 Sep 2017 07:42:43 +0100
Subject: [PATCH] Moved TofEvent to Mantid::Types re 20436
---
Framework/Types/inc/MantidTypes/TofEvent.h | 29 +++++++---------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/Framework/Types/inc/MantidTypes/TofEvent.h b/Framework/Types/inc/MantidTypes/TofEvent.h
index e2928ea7271..864be7ba7a0 100644
--- a/Framework/Types/inc/MantidTypes/TofEvent.h
+++ b/Framework/Types/inc/MantidTypes/TofEvent.h
@@ -4,17 +4,6 @@
#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:
@@ -26,14 +15,14 @@ namespace Types {
class _declspec(dllexport) TofEvent {
/// EventList has the right to mess with TofEvent.
- 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
+ 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
protected:
/** The 'x value' of the event. This will be in a unit available from the
@@ -116,4 +105,4 @@ inline double TofEvent::error() const { return 1.0; }
inline double TofEvent::errorSquared() const { return 1.0; }
} // namespace Types
} // namespace Mantid
-#endif // MANTIS_TYPES_TOFEVENT_H
\ No newline at end of file
+#endif // MANTIS_TYPES_TOFEVENT_H
--
GitLab