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

move DateAndTime/TofEvents to Types::Core/Event #20436

parent 7a2b41dd
...@@ -423,7 +423,7 @@ private: ...@@ -423,7 +423,7 @@ private:
bool executeAsyncImpl(const Poco::Void &i); bool executeAsyncImpl(const Poco::Void &i);
bool doCallProcessGroups(Mantid::Types::DateAndTime &start_time); bool doCallProcessGroups(Mantid::Types::Core::DateAndTime &start_time);
// Report that the algorithm has completed. // Report that the algorithm has completed.
void reportCompleted(const double &duration, void reportCompleted(const double &duration,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include "MantidKernel/PropertyHistory.h" #include "MantidKernel/PropertyHistory.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include <nexus/NeXusFile.hpp> #include <nexus/NeXusFile.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
...@@ -74,19 +74,19 @@ class MANTID_API_DLL AlgorithmHistory { ...@@ -74,19 +74,19 @@ class MANTID_API_DLL AlgorithmHistory {
public: public:
/// History container /// History container
/// The date-and-time will be stored as the Mantid::Types::DateAndTime type /// The date-and-time will be stored as the Mantid::Types::Core::DateAndTime type
explicit AlgorithmHistory( explicit AlgorithmHistory(
const Algorithm *const alg, const Algorithm *const alg,
const Mantid::Types::DateAndTime &start = Mantid::Types::DateAndTime::getCurrentTime(), const Types::Core::DateAndTime &start = Types::Core::DateAndTime::getCurrentTime(),
const double &duration = -1.0, std::size_t uexeccount = 0); const double &duration = -1.0, std::size_t uexeccount = 0);
~AlgorithmHistory(); ~AlgorithmHistory();
AlgorithmHistory &operator=(const AlgorithmHistory &); AlgorithmHistory &operator=(const AlgorithmHistory &);
AlgorithmHistory(const AlgorithmHistory &); AlgorithmHistory(const AlgorithmHistory &);
AlgorithmHistory( AlgorithmHistory(
const std::string &name, int vers, const std::string &name, int vers,
const Mantid::Types::DateAndTime &start = Mantid::Types::DateAndTime::getCurrentTime(), const Types::Core::DateAndTime &start = Types::Core::DateAndTime::getCurrentTime(),
const double &duration = -1.0, std::size_t uexeccount = 0); const double &duration = -1.0, std::size_t uexeccount = 0);
void addExecutionInfo(const Mantid::Types::DateAndTime &start, void addExecutionInfo(const Types::Core::DateAndTime &start,
const double &duration); const double &duration);
void addProperty(const std::string &name, const std::string &value, void addProperty(const std::string &name, const std::string &value,
bool isdefault, const unsigned int &direction = 99); bool isdefault, const unsigned int &direction = 99);
...@@ -101,7 +101,7 @@ public: ...@@ -101,7 +101,7 @@ public:
/// get execution duration /// get execution duration
double executionDuration() const { return m_executionDuration; } double executionDuration() const { return m_executionDuration; }
/// get execution date /// get execution date
Mantid::Types::DateAndTime executionDate() const { return m_executionDate; } Mantid::Types::Core::DateAndTime executionDate() const { return m_executionDate; }
/// get the execution count /// get the execution count
const std::size_t &execCount() const { return m_execCount; } const std::size_t &execCount() const { return m_execCount; }
/// get parameter list of algorithm in history const /// get parameter list of algorithm in history const
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
void setExecCount(std::size_t execCount) { m_execCount = execCount; } void setExecCount(std::size_t execCount) { m_execCount = execCount; }
/// Set data on history after it is created /// Set data on history after it is created
void fillAlgorithmHistory(const Algorithm *const alg, void fillAlgorithmHistory(const Algorithm *const alg,
const Mantid::Types::DateAndTime &start, const Types::Core::DateAndTime &start,
const double &duration, std::size_t uexeccount); const double &duration, std::size_t uexeccount);
// Allow Algorithm::execute to change the exec count & duration after the // Allow Algorithm::execute to change the exec count & duration after the
// algorithm was executed // algorithm was executed
...@@ -157,7 +157,7 @@ private: ...@@ -157,7 +157,7 @@ private:
/// The version of the algorithm /// The version of the algorithm
int m_version{-1}; int m_version{-1};
/// The execution date of the algorithm /// The execution date of the algorithm
Mantid::Types::DateAndTime m_executionDate; Mantid::Types::Core::DateAndTime m_executionDate;
/// The execution duration of the algorithm /// The execution duration of the algorithm
double m_executionDuration{-1.0}; double m_executionDuration{-1.0};
/// The PropertyHistory's defined for the algorithm /// The PropertyHistory's defined for the algorithm
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include "MantidAPI/HistoryItem.h" #include "MantidAPI/HistoryItem.h"
#include "MantidAPI/WorkspaceHistory.h" #include "MantidAPI/WorkspaceHistory.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include <list> #include <list>
#include <vector> #include <vector>
...@@ -53,9 +53,9 @@ public: ...@@ -53,9 +53,9 @@ public:
void unrollAll(); void unrollAll();
void roll(size_t index); void roll(size_t index);
void rollAll(); void rollAll();
void filterBetweenExecDate(Mantid::Types::DateAndTime start, void filterBetweenExecDate(Mantid::Types::Core::DateAndTime start,
Mantid::Types::DateAndTime end = Mantid::Types::Core::DateAndTime end =
Mantid::Types::DateAndTime::getCurrentTime()); Mantid::Types::Core::DateAndTime::getCurrentTime());
/** /**
* Get the list of History Items for this view. * Get the list of History Items for this view.
* *
......
#ifndef MANTID_API_IEVENTLIST_H_ #ifndef MANTID_API_IEVENTLIST_H_
#define MANTID_API_IEVENTLIST_H_ #define MANTID_API_IEVENTLIST_H_
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include "MantidAPI/MatrixWorkspace_fwd.h" #include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/ISpectrum.h" #include "MantidAPI/ISpectrum.h"
#include <functional> #include <functional>
...@@ -84,21 +84,21 @@ public: ...@@ -84,21 +84,21 @@ public:
/// Return the list of event weight error values /// Return the list of event weight error values
virtual void getWeightErrors(std::vector<double> &weightErrors) const = 0; virtual void getWeightErrors(std::vector<double> &weightErrors) const = 0;
/// Return the list of pulse time values /// Return the list of pulse time values
virtual std::vector<Mantid::Types::DateAndTime> getPulseTimes() const = 0; virtual std::vector<Mantid::Types::Core::DateAndTime> getPulseTimes() const = 0;
/// Get the minimum TOF from the list /// Get the minimum TOF from the list
virtual double getTofMin() const = 0; virtual double getTofMin() const = 0;
/// Get the maximum TOF from the list /// Get the maximum TOF from the list
virtual double getTofMax() const = 0; virtual double getTofMax() const = 0;
/// Get the minimum pulse time from the list /// Get the minimum pulse time from the list
virtual Mantid::Types::DateAndTime getPulseTimeMin() const = 0; virtual Mantid::Types::Core::DateAndTime getPulseTimeMin() const = 0;
/// Get the maximum pulse time from the list /// Get the maximum pulse time from the list
virtual Mantid::Types::DateAndTime getPulseTimeMax() const = 0; virtual Mantid::Types::Core::DateAndTime getPulseTimeMax() const = 0;
/// Get the maximum time at sample. /// Get the maximum time at sample.
virtual Mantid::Types::DateAndTime virtual Mantid::Types::Core::DateAndTime
getTimeAtSampleMax(const double &tofFactor, getTimeAtSampleMax(const double &tofFactor,
const double &tofOffset) const = 0; const double &tofOffset) const = 0;
/// Get the minimum time at sample /// Get the minimum time at sample
virtual Mantid::Types::DateAndTime virtual Mantid::Types::Core::DateAndTime
getTimeAtSampleMin(const double &tofFactor, getTimeAtSampleMin(const double &tofFactor,
const double &tofOffset) const = 0; const double &tofOffset) const = 0;
/// Set the TOFs from the given list /// Set the TOFs from the given list
......
...@@ -56,11 +56,11 @@ public: ...@@ -56,11 +56,11 @@ public:
virtual std::size_t getNumberEvents() const = 0; virtual std::size_t getNumberEvents() const = 0;
virtual double getTofMin() const = 0; virtual double getTofMin() const = 0;
virtual double getTofMax() const = 0; virtual double getTofMax() const = 0;
virtual Mantid::Types::DateAndTime getPulseTimeMax() const = 0; virtual Mantid::Types::Core::DateAndTime getPulseTimeMax() const = 0;
virtual Mantid::Types::DateAndTime getPulseTimeMin() const = 0; virtual Mantid::Types::Core::DateAndTime getPulseTimeMin() const = 0;
virtual Mantid::Types::DateAndTime virtual Mantid::Types::Core::DateAndTime
getTimeAtSampleMax(double tofOffset = 0) const = 0; getTimeAtSampleMax(double tofOffset = 0) const = 0;
virtual Mantid::Types::DateAndTime virtual Mantid::Types::Core::DateAndTime
getTimeAtSampleMin(double tofOffset = 0) const = 0; getTimeAtSampleMin(double tofOffset = 0) const = 0;
virtual EventType getEventType() const = 0; virtual EventType getEventType() const = 0;
void generateHistogram(const std::size_t index, const MantidVec &X, void generateHistogram(const std::size_t index, const MantidVec &X,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include "MantidGeometry/IDTypes.h" #include "MantidGeometry/IDTypes.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include "MantidKernel/PropertyManager.h" #include "MantidKernel/PropertyManager.h"
#include <Poco/Net/SocketAddress.h> #include <Poco/Net/SocketAddress.h>
#include <string> #include <string>
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
* The value of 'start of run' is 1 second * The value of 'start of run' is 1 second
* for compatibility with the SNS live stream and ISIS Kafka live stream. * for compatibility with the SNS live stream and ISIS Kafka live stream.
*/ */
virtual void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) = 0; virtual void start(Types::Core::DateAndTime startTime = Types::Core::DateAndTime()) = 0;
/** Get the data that's been buffered since the last call to this method /** Get the data that's been buffered since the last call to this method
* (or since start() was called). * (or since start() was called).
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define MANTID_KERNEL_IREMOTEJOBMANAGER_H #define MANTID_KERNEL_IREMOTEJOBMANAGER_H
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
namespace Mantid { namespace Mantid {
namespace API { namespace API {
...@@ -91,13 +91,13 @@ public: ...@@ -91,13 +91,13 @@ public:
/// Date-time of submission. No particular format can be assumed /// Date-time of submission. No particular format can be assumed
/// from the specific remote job managers, and some of them may /// from the specific remote job managers, and some of them may
/// not provide this info /// not provide this info
Mantid::Types::DateAndTime submitDate; Mantid::Types::Core::DateAndTime submitDate;
/// Date-time the job actually started running. No particular /// Date-time the job actually started running. No particular
/// format can be assumed /// format can be assumed
Mantid::Types::DateAndTime startDate; Mantid::Types::Core::DateAndTime startDate;
/// Date-time the job finished. No particular format can be /// Date-time the job finished. No particular format can be
/// assumed /// assumed
Mantid::Types::DateAndTime completionTime; Mantid::Types::Core::DateAndTime completionTime;
/// Command line for this job (when running a command ideally this /// Command line for this job (when running a command ideally this
/// would be provided by the underlying job scheduling /// would be provided by the underlying job scheduling
/// mechanism). As examples, Platform LSF provides this. For the /// mechanism). As examples, Platform LSF provides this. For the
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
#define MANTID_API_LOGMANAGER_H_ #define MANTID_API_LOGMANAGER_H_
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include "MantidKernel/make_unique.h"
#include "MantidKernel/PropertyWithValue.h" #include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/Statistics.h" #include "MantidKernel/Statistics.h"
#include "MantidKernel/make_unique.h"
#include <memory> #include <memory>
#include <vector> #include <vector>
...@@ -14,15 +14,17 @@ class File; ...@@ -14,15 +14,17 @@ class File;
namespace Mantid { namespace Mantid {
namespace Types { namespace Types {
namespace Core {
class DateAndTime; class DateAndTime;
} }
} // namespace Types
namespace Kernel { namespace Kernel {
template <class KEYTYPE, class VALUETYPE> class Cache; template <class KEYTYPE, class VALUETYPE> class Cache;
template <typename TYPE> class TimeSeriesProperty; template <typename TYPE> class TimeSeriesProperty;
class SplittingInterval; class SplittingInterval;
typedef std::vector<SplittingInterval> TimeSplitterType; typedef std::vector<SplittingInterval> TimeSplitterType;
class PropertyManager; class PropertyManager;
} // namespace Kernel }
namespace API { namespace API {
...@@ -65,17 +67,17 @@ public: ...@@ -65,17 +67,17 @@ public:
//------------------------------------------------------------- //-------------------------------------------------------------
/// Set the run start and end /// Set the run start and end
void setStartAndEndTime(const Mantid::Types::DateAndTime &start, void setStartAndEndTime(const Types::Core::DateAndTime &start,
const Mantid::Types::DateAndTime &end); const Types::Core::DateAndTime &end);
/// Return the run start time /// Return the run start time
const Mantid::Types::DateAndTime startTime() const; const Types::Core::DateAndTime startTime() const;
/// Return the run end time /// Return the run end time
const Mantid::Types::DateAndTime endTime() const; const Types::Core::DateAndTime endTime() const;
//------------------------------------------------------------- //-------------------------------------------------------------
/// Filter the logs by time /// Filter the logs by time
virtual void filterByTime(const Mantid::Types::DateAndTime start, virtual void filterByTime(const Types::Core::DateAndTime start,
const Mantid::Types::DateAndTime stop); const Types::Core::DateAndTime stop);
/// Split the logs based on the given intervals /// Split the logs based on the given intervals
virtual void splitByTime(Kernel::TimeSplitterType &splitter, virtual void splitByTime(Kernel::TimeSplitterType &splitter,
std::vector<LogManager *> outputs) const; std::vector<LogManager *> outputs) const;
...@@ -243,7 +245,7 @@ void LogManager::addProperty(const std::string &name, const TYPE &value, ...@@ -243,7 +245,7 @@ void LogManager::addProperty(const std::string &name, const TYPE &value,
newProp->setUnits(units); newProp->setUnits(units);
addProperty(std::move(newProp), overwrite); addProperty(std::move(newProp), overwrite);
} }
} // namespace API }
} // namespace Mantid }
#endif // MANTID_API_LOGMANAGER_H_ #endif // MANTID_API_LOGMANAGER_H_
...@@ -18,8 +18,10 @@ class IndexInfo; ...@@ -18,8 +18,10 @@ class IndexInfo;
} }
namespace Types { namespace Types {
namespace Core {
class DateAndTime; class DateAndTime;
} }
}
namespace Geometry { namespace Geometry {
class ParameterMap; class ParameterMap;
...@@ -153,8 +155,8 @@ public: ...@@ -153,8 +155,8 @@ public:
/// Gets MatrixWorkspace title (same as Run object run_title property) /// Gets MatrixWorkspace title (same as Run object run_title property)
const std::string getTitle() const override; const std::string getTitle() const override;
virtual Mantid::Types::DateAndTime getFirstPulseTime() const; virtual Types::Core::DateAndTime getFirstPulseTime() const;
Mantid::Types::DateAndTime getLastPulseTime() const; Types::Core::DateAndTime getLastPulseTime() const;
/// Returns the bin index for a given X value of a given workspace index /// Returns the bin index for a given X value of a given workspace index
size_t binIndexOf(const double xValue, const std::size_t = 0) const; size_t binIndexOf(const double xValue, const std::size_t = 0) const;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "MantidKernel/Exception.h" #include "MantidKernel/Exception.h"
#include "MantidKernel/V3D.h" #include "MantidKernel/V3D.h"
#include "MantidKernel/Quat.h" #include "MantidKernel/Quat.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include "MantidKernel/ArrayProperty.h" #include "MantidKernel/ArrayProperty.h"
#include "MantidGeometry/IComponent.h" #include "MantidGeometry/IComponent.h"
#include "MantidGeometry/IDetector.h" #include "MantidGeometry/IDetector.h"
......
...@@ -65,8 +65,8 @@ public: ...@@ -65,8 +65,8 @@ public:
Run &operator+=(const Run &rhs); Run &operator+=(const Run &rhs);
/// Filter the logs by time /// Filter the logs by time
void filterByTime(const Mantid::Types::DateAndTime start, void filterByTime(const Types::Core::DateAndTime start,
const Mantid::Types::DateAndTime stop) override; const Types::Core::DateAndTime stop) override;
/// Split the logs based on the given intervals /// Split the logs based on the given intervals
void splitByTime(Kernel::TimeSplitterType &splitter, void splitByTime(Kernel::TimeSplitterType &splitter,
std::vector<LogManager *> outputs) const override; std::vector<LogManager *> outputs) const override;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include "MantidAPI/DllConfig.h" #include "MantidAPI/DllConfig.h"
#include <vector> #include <vector>
...@@ -16,7 +16,7 @@ struct ScriptInfo { ...@@ -16,7 +16,7 @@ struct ScriptInfo {
/// Identification of the author of the script. /// Identification of the author of the script.
std::string author; std::string author;
/// Time of the last update of this file (remotelly) /// Time of the last update of this file (remotelly)
Mantid::Types::DateAndTime pub_date; Types::Core::DateAndTime pub_date;
/// Marked for auto update /// Marked for auto update
bool auto_update; bool auto_update;
/// Directory Flag to indicate if the entry is a directory. /// Directory Flag to indicate if the entry is a directory.
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "MantidAPI/WorkspaceHistory.h" #include "MantidAPI/WorkspaceHistory.h"
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidTypes/DateAndTime.h" #include "MantidKernel/DateAndTime.h"
#include "MantidKernel/EmptyValues.h" #include "MantidKernel/EmptyValues.h"
#include "MantidKernel/MultiThreaded.h" #include "MantidKernel/MultiThreaded.h"
#include "MantidKernel/Strings.h" #include "MantidKernel/Strings.h"
...@@ -437,7 +437,7 @@ bool Algorithm::execute() { ...@@ -437,7 +437,7 @@ bool Algorithm::execute() {
} }
notificationCenter().postNotification(new StartedNotification(this)); notificationCenter().postNotification(new StartedNotification(this));
Mantid::Types::DateAndTime startTime; Mantid::Types::Core::DateAndTime startTime;
// Return a failure if the algorithm hasn't been initialized // Return a failure if the algorithm hasn't been initialized
if (!isInitialized()) { if (!isInitialized()) {
...@@ -549,7 +549,7 @@ bool Algorithm::execute() { ...@@ -549,7 +549,7 @@ bool Algorithm::execute() {
m_running = true; m_running = true;
} }
startTime = Mantid::Types::DateAndTime::getCurrentTime(); startTime = Mantid::Types::Core::DateAndTime::getCurrentTime();
// Start a timer // Start a timer
Timer timer; Timer timer;
// Call the concrete algorithm's exec method // Call the concrete algorithm's exec method
...@@ -1205,13 +1205,13 @@ bool Algorithm::checkGroups() { ...@@ -1205,13 +1205,13 @@ bool Algorithm::checkGroups() {
* *
* @return whether processGroups succeeds. * @return whether processGroups succeeds.
*/ */
bool Algorithm::doCallProcessGroups(Mantid::Types::DateAndTime &startTime) { bool Algorithm::doCallProcessGroups(Mantid::Types::Core::DateAndTime &startTime) {
// In the base implementation of processGroups, this normally calls // In the base implementation of processGroups, this normally calls
// this->execute() again on each member of the group. Other algorithms may // this->execute() again on each member of the group. Other algorithms may
// choose to override that behavior (examples: CompareWorkspaces, // choose to override that behavior (examples: CompareWorkspaces,
// CheckWorkspacesMatch, RenameWorkspace) // CheckWorkspacesMatch, RenameWorkspace)
startTime = Mantid::Types::DateAndTime::getCurrentTime(); startTime = Mantid::Types::Core::DateAndTime::getCurrentTime();
// Start a timer // Start a timer
Timer timer; Timer timer;
......
...@@ -9,7 +9,7 @@ namespace Mantid { ...@@ -9,7 +9,7 @@ namespace Mantid {
namespace API { namespace API {
using Kernel::Property; using Kernel::Property;
using Mantid::Types::DateAndTime; using Types::Core::DateAndTime;
using Kernel::PropertyHistory; using Kernel::PropertyHistory;
using Kernel::PropertyHistory_sptr; using Kernel::PropertyHistory_sptr;
using Kernel::PropertyHistory_const_sptr; using Kernel::PropertyHistory_const_sptr;
...@@ -24,7 +24,7 @@ using Kernel::PropertyHistories; ...@@ -24,7 +24,7 @@ using Kernel::PropertyHistories;
* @param uexeccount :: an unsigned int for algorithm execution order * @param uexeccount :: an unsigned int for algorithm execution order
*/ */
AlgorithmHistory::AlgorithmHistory(const Algorithm *const alg, AlgorithmHistory::AlgorithmHistory(const Algorithm *const alg,
const Mantid::Types::DateAndTime &start, const Types::Core::DateAndTime &start,
const double &duration, const double &duration,
std::size_t uexeccount) std::size_t uexeccount)
: m_name(alg->name()), m_version(alg->version()), m_executionDate(start), : m_name(alg->name()), m_version(alg->version()), m_executionDate(start),
...@@ -49,7 +49,7 @@ AlgorithmHistory::~AlgorithmHistory() = default; ...@@ -49,7 +49,7 @@ AlgorithmHistory::~AlgorithmHistory() = default;
@param uexeccount :: an unsigned int for algorithm execution order @param uexeccount :: an unsigned int for algorithm execution order
*/ */
AlgorithmHistory::AlgorithmHistory(const std::string &name, int vers, AlgorithmHistory::AlgorithmHistory(const std::string &name, int vers,
const Mantid::Types::DateAndTime &start, const Types::Core::DateAndTime &start,
const double &duration, const double &duration,
std::size_t uexeccount) std::size_t uexeccount)
: m_name(name), m_version(vers), m_executionDate(start), : m_name(name), m_version(vers), m_executionDate(start),
...@@ -83,7 +83,7 @@ void AlgorithmHistory::setProperties(const Algorithm *const alg) { ...@@ -83,7 +83,7 @@ void AlgorithmHistory::setProperties(const Algorithm *const alg) {
* @param uexeccount :: an unsigned int for algorithm execution order * @param uexeccount :: an unsigned int for algorithm execution order
*/ */
void AlgorithmHistory::fillAlgorithmHistory(const Algorithm *const alg, void AlgorithmHistory::fillAlgorithmHistory(const Algorithm *const alg,
const Mantid::Types::DateAndTime &start, const Types::Core::DateAndTime &start,
const double &duration, const double &duration,
std::size_t uexeccount) { std::size_t uexeccount) {
m_name = alg->name(); m_name = alg->name();
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
#include "MantidGeometry/Instrument/Detector.h" #include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/DetectorInfo.h" #include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidGeometry/Instrument/InstrumentDefinitionParser.h" #include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Instrument/ParameterFactory.h" #include "MantidGeometry/Instrument/ParameterFactory.h"
#include "MantidGeometry/Instrument/ParameterMap.h" #include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Instrument/RectangularDetector.h" #include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidGeometry/Instrument/XMLInstrumentParameter.h" #include "MantidGeometry/Instrument/XMLInstrumentParameter.h"