diff --git a/Framework/API/inc/MantidAPI/Algorithm.h b/Framework/API/inc/MantidAPI/Algorithm.h
index 13d9278ee16230aec8cbc56d9bcaff8fe2c2e522..5a8e442e15a00315f69961d5e364649d8bc8151c 100644
--- a/Framework/API/inc/MantidAPI/Algorithm.h
+++ b/Framework/API/inc/MantidAPI/Algorithm.h
@@ -423,7 +423,7 @@ private:
bool executeAsyncImpl(const Poco::Void &i);
- bool doCallProcessGroups(Mantid::Kernel::DateAndTime &start_time);
+ bool doCallProcessGroups(Mantid::Types::DateAndTime &start_time);
// Report that the algorithm has completed.
void reportCompleted(const double &duration,
diff --git a/Framework/API/inc/MantidAPI/AlgorithmHistory.h b/Framework/API/inc/MantidAPI/AlgorithmHistory.h
index 583d66e18f70765e89a2d84285eefc4686ee61e5..8e3ea8e5fd49576141d92e00f2775747395bc885 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmHistory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmHistory.h
@@ -6,7 +6,7 @@
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/PropertyHistory.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <nexus/NeXusFile.hpp>
#include <boost/bind.hpp>
@@ -74,19 +74,19 @@ class MANTID_API_DLL AlgorithmHistory {
public:
/// History container
- /// The date-and-time will be stored as the Mantid::Kernel::DateAndTime type
+ /// The date-and-time will be stored as the Mantid::Types::DateAndTime type
explicit AlgorithmHistory(
const Algorithm *const alg,
- const Kernel::DateAndTime &start = Kernel::DateAndTime::getCurrentTime(),
+ const Mantid::Types::DateAndTime &start = Mantid::Types::DateAndTime::getCurrentTime(),
const double &duration = -1.0, std::size_t uexeccount = 0);
~AlgorithmHistory();
AlgorithmHistory &operator=(const AlgorithmHistory &);
AlgorithmHistory(const AlgorithmHistory &);
AlgorithmHistory(
const std::string &name, int vers,
- const Kernel::DateAndTime &start = Kernel::DateAndTime::getCurrentTime(),
+ const Mantid::Types::DateAndTime &start = Mantid::Types::DateAndTime::getCurrentTime(),
const double &duration = -1.0, std::size_t uexeccount = 0);
- void addExecutionInfo(const Kernel::DateAndTime &start,
+ void addExecutionInfo(const Mantid::Types::DateAndTime &start,
const double &duration);
void addProperty(const std::string &name, const std::string &value,
bool isdefault, const unsigned int &direction = 99);
@@ -101,7 +101,7 @@ public:
/// get execution duration
double executionDuration() const { return m_executionDuration; }
/// get execution date
- Mantid::Kernel::DateAndTime executionDate() const { return m_executionDate; }
+ Mantid::Types::DateAndTime executionDate() const { return m_executionDate; }
/// get the execution count
const std::size_t &execCount() const { return m_execCount; }
/// get parameter list of algorithm in history const
@@ -141,7 +141,7 @@ public:
void setExecCount(std::size_t execCount) { m_execCount = execCount; }
/// Set data on history after it is created
void fillAlgorithmHistory(const Algorithm *const alg,
- const Kernel::DateAndTime &start,
+ const Mantid::Types::DateAndTime &start,
const double &duration, std::size_t uexeccount);
// Allow Algorithm::execute to change the exec count & duration after the
// algorithm was executed
@@ -157,7 +157,7 @@ private:
/// The version of the algorithm
int m_version{-1};
/// The execution date of the algorithm
- Mantid::Kernel::DateAndTime m_executionDate;
+ Mantid::Types::DateAndTime m_executionDate;
/// The execution duration of the algorithm
double m_executionDuration{-1.0};
/// The PropertyHistory's defined for the algorithm
diff --git a/Framework/API/inc/MantidAPI/HistoryView.h b/Framework/API/inc/MantidAPI/HistoryView.h
index 2f8d32db40745440dd1d1c765b43b0a9510a9f9f..2021417d83680ca366cacb1b8f3a4f72b5afe40d 100644
--- a/Framework/API/inc/MantidAPI/HistoryView.h
+++ b/Framework/API/inc/MantidAPI/HistoryView.h
@@ -7,7 +7,7 @@
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/HistoryItem.h"
#include "MantidAPI/WorkspaceHistory.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <list>
#include <vector>
@@ -53,9 +53,9 @@ public:
void unrollAll();
void roll(size_t index);
void rollAll();
- void filterBetweenExecDate(Mantid::Kernel::DateAndTime start,
- Mantid::Kernel::DateAndTime end =
- Mantid::Kernel::DateAndTime::getCurrentTime());
+ void filterBetweenExecDate(Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime end =
+ Mantid::Types::DateAndTime::getCurrentTime());
/**
* Get the list of History Items for this view.
*
diff --git a/Framework/API/inc/MantidAPI/IEventList.h b/Framework/API/inc/MantidAPI/IEventList.h
index ed28d74549b885435517a6d1fa5feb47e467336c..6e591fb1f95ae56691b717d35d059593e4f2f6b2 100644
--- a/Framework/API/inc/MantidAPI/IEventList.h
+++ b/Framework/API/inc/MantidAPI/IEventList.h
@@ -1,7 +1,7 @@
#ifndef MANTID_API_IEVENTLIST_H_
#define MANTID_API_IEVENTLIST_H_
#include "MantidAPI/DllConfig.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/ISpectrum.h"
#include <functional>
@@ -84,21 +84,21 @@ public:
/// Return the list of event weight error values
virtual void getWeightErrors(std::vector<double> &weightErrors) const = 0;
/// Return the list of pulse time values
- virtual std::vector<Mantid::Kernel::DateAndTime> getPulseTimes() const = 0;
+ virtual std::vector<Mantid::Types::DateAndTime> getPulseTimes() const = 0;
/// Get the minimum TOF from the list
virtual double getTofMin() const = 0;
/// Get the maximum TOF from the list
virtual double getTofMax() const = 0;
/// Get the minimum pulse time from the list
- virtual Mantid::Kernel::DateAndTime getPulseTimeMin() const = 0;
+ virtual Mantid::Types::DateAndTime getPulseTimeMin() const = 0;
/// Get the maximum pulse time from the list
- virtual Mantid::Kernel::DateAndTime getPulseTimeMax() const = 0;
+ virtual Mantid::Types::DateAndTime getPulseTimeMax() const = 0;
/// Get the maximum time at sample.
- virtual Mantid::Kernel::DateAndTime
+ virtual Mantid::Types::DateAndTime
getTimeAtSampleMax(const double &tofFactor,
const double &tofOffset) const = 0;
/// Get the minimum time at sample
- virtual Mantid::Kernel::DateAndTime
+ virtual Mantid::Types::DateAndTime
getTimeAtSampleMin(const double &tofFactor,
const double &tofOffset) const = 0;
/// Set the TOFs from the given list
diff --git a/Framework/API/inc/MantidAPI/IEventWorkspace.h b/Framework/API/inc/MantidAPI/IEventWorkspace.h
index 372d4fad6be93c5ce2b716cc5a6ebb1ac7e777af..a7506ec4543fdbe457b69a4856879b8171d72b3a 100644
--- a/Framework/API/inc/MantidAPI/IEventWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IEventWorkspace.h
@@ -56,11 +56,11 @@ public:
virtual std::size_t getNumberEvents() const = 0;
virtual double getTofMin() const = 0;
virtual double getTofMax() const = 0;
- virtual Mantid::Kernel::DateAndTime getPulseTimeMax() const = 0;
- virtual Mantid::Kernel::DateAndTime getPulseTimeMin() const = 0;
- virtual Mantid::Kernel::DateAndTime
+ virtual Mantid::Types::DateAndTime getPulseTimeMax() const = 0;
+ virtual Mantid::Types::DateAndTime getPulseTimeMin() const = 0;
+ virtual Mantid::Types::DateAndTime
getTimeAtSampleMax(double tofOffset = 0) const = 0;
- virtual Mantid::Kernel::DateAndTime
+ virtual Mantid::Types::DateAndTime
getTimeAtSampleMin(double tofOffset = 0) const = 0;
virtual EventType getEventType() const = 0;
void generateHistogram(const std::size_t index, const MantidVec &X,
diff --git a/Framework/API/inc/MantidAPI/ILiveListener.h b/Framework/API/inc/MantidAPI/ILiveListener.h
index 919a4a1bcef6c28917cc5b9e9a0687dbeda01dbc..195580b8bb221a255f736d6a0b5bb835af63bd7d 100644
--- a/Framework/API/inc/MantidAPI/ILiveListener.h
+++ b/Framework/API/inc/MantidAPI/ILiveListener.h
@@ -6,7 +6,7 @@
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidGeometry/IDTypes.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/PropertyManager.h"
#include <Poco/Net/SocketAddress.h>
#include <string>
@@ -78,7 +78,7 @@ public:
* The value of 'start of run' is 1 second
* for compatibility with the SNS live stream and ISIS Kafka live stream.
*/
- virtual void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) = 0;
+ virtual void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) = 0;
/** Get the data that's been buffered since the last call to this method
* (or since start() was called).
diff --git a/Framework/API/inc/MantidAPI/IRemoteJobManager.h b/Framework/API/inc/MantidAPI/IRemoteJobManager.h
index e48676527bc8cf864d5626efd21a9e0753ed528a..f69d252586cc60a15e0d345dbde6adfe3ea981ad 100644
--- a/Framework/API/inc/MantidAPI/IRemoteJobManager.h
+++ b/Framework/API/inc/MantidAPI/IRemoteJobManager.h
@@ -2,7 +2,7 @@
#define MANTID_KERNEL_IREMOTEJOBMANAGER_H
#include "MantidAPI/DllConfig.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
namespace Mantid {
namespace API {
@@ -91,13 +91,13 @@ public:
/// Date-time of submission. No particular format can be assumed
/// from the specific remote job managers, and some of them may
/// not provide this info
- Mantid::Kernel::DateAndTime submitDate;
+ Mantid::Types::DateAndTime submitDate;
/// Date-time the job actually started running. No particular
/// format can be assumed
- Mantid::Kernel::DateAndTime startDate;
+ Mantid::Types::DateAndTime startDate;
/// Date-time the job finished. No particular format can be
/// assumed
- Mantid::Kernel::DateAndTime completionTime;
+ Mantid::Types::DateAndTime completionTime;
/// Command line for this job (when running a command ideally this
/// would be provided by the underlying job scheduling
/// mechanism). As examples, Platform LSF provides this. For the
diff --git a/Framework/API/inc/MantidAPI/LogManager.h b/Framework/API/inc/MantidAPI/LogManager.h
index 70a660e56d0108cb384ebf079b5ae69463ba4b3a..04631134509a39ecd273e22e58c1a414c650b0a7 100644
--- a/Framework/API/inc/MantidAPI/LogManager.h
+++ b/Framework/API/inc/MantidAPI/LogManager.h
@@ -2,9 +2,9 @@
#define MANTID_API_LOGMANAGER_H_
#include "MantidAPI/DllConfig.h"
-#include "MantidKernel/make_unique.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/Statistics.h"
+#include "MantidKernel/make_unique.h"
#include <memory>
#include <vector>
@@ -13,14 +13,16 @@ class File;
}
namespace Mantid {
+namespace Types {
+class DateAndTime;
+}
namespace Kernel {
template <class KEYTYPE, class VALUETYPE> class Cache;
template <typename TYPE> class TimeSeriesProperty;
class SplittingInterval;
typedef std::vector<SplittingInterval> TimeSplitterType;
-class DateAndTime;
class PropertyManager;
-}
+} // namespace Kernel
namespace API {
@@ -63,17 +65,17 @@ public:
//-------------------------------------------------------------
/// Set the run start and end
- void setStartAndEndTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &end);
+ void setStartAndEndTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &end);
/// Return the run start time
- const Kernel::DateAndTime startTime() const;
+ const Mantid::Types::DateAndTime startTime() const;
/// Return the run end time
- const Kernel::DateAndTime endTime() const;
+ const Mantid::Types::DateAndTime endTime() const;
//-------------------------------------------------------------
/// Filter the logs by time
- virtual void filterByTime(const Kernel::DateAndTime start,
- const Kernel::DateAndTime stop);
+ virtual void filterByTime(const Mantid::Types::DateAndTime start,
+ const Mantid::Types::DateAndTime stop);
/// Split the logs based on the given intervals
virtual void splitByTime(Kernel::TimeSplitterType &splitter,
std::vector<LogManager *> outputs) const;
@@ -241,7 +243,7 @@ void LogManager::addProperty(const std::string &name, const TYPE &value,
newProp->setUnits(units);
addProperty(std::move(newProp), overwrite);
}
-}
-}
+} // namespace API
+} // namespace Mantid
#endif // MANTID_API_LOGMANAGER_H_
diff --git a/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Framework/API/inc/MantidAPI/MatrixWorkspace.h
index 249aed53732c724d37f5f3eeae721e336631a98c..08877250a84f34d90589bad120dff5dea786f957 100644
--- a/Framework/API/inc/MantidAPI/MatrixWorkspace.h
+++ b/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -17,7 +17,7 @@ namespace Indexing {
class IndexInfo;
}
-namespace Kernel {
+namespace Types {
class DateAndTime;
}
@@ -153,8 +153,8 @@ public:
/// Gets MatrixWorkspace title (same as Run object run_title property)
const std::string getTitle() const override;
- virtual Kernel::DateAndTime getFirstPulseTime() const;
- Kernel::DateAndTime getLastPulseTime() const;
+ virtual Mantid::Types::DateAndTime getFirstPulseTime() const;
+ Mantid::Types::DateAndTime getLastPulseTime() const;
/// 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;
diff --git a/Framework/API/inc/MantidAPI/PrecompiledHeader.h b/Framework/API/inc/MantidAPI/PrecompiledHeader.h
index 4869d894bee622cffb880d4809900bf0d5a8e614..4bf00c115c0b98f4bcbad1e03d05d75beeb64138 100644
--- a/Framework/API/inc/MantidAPI/PrecompiledHeader.h
+++ b/Framework/API/inc/MantidAPI/PrecompiledHeader.h
@@ -9,7 +9,7 @@
#include "MantidKernel/Exception.h"
#include "MantidKernel/V3D.h"
#include "MantidKernel/Quat.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidGeometry/IComponent.h"
#include "MantidGeometry/IDetector.h"
diff --git a/Framework/API/inc/MantidAPI/Run.h b/Framework/API/inc/MantidAPI/Run.h
index 7ee2c1d354971780691b71cc510147a8d2fb7685..05395fa67bc9085ef67c43c19e64f65572eff684 100644
--- a/Framework/API/inc/MantidAPI/Run.h
+++ b/Framework/API/inc/MantidAPI/Run.h
@@ -65,8 +65,8 @@ public:
Run &operator+=(const Run &rhs);
/// Filter the logs by time
- void filterByTime(const Kernel::DateAndTime start,
- const Kernel::DateAndTime stop) override;
+ void filterByTime(const Mantid::Types::DateAndTime start,
+ const Mantid::Types::DateAndTime stop) override;
/// Split the logs based on the given intervals
void splitByTime(Kernel::TimeSplitterType &splitter,
std::vector<LogManager *> outputs) const override;
diff --git a/Framework/API/inc/MantidAPI/ScriptRepository.h b/Framework/API/inc/MantidAPI/ScriptRepository.h
index 1b3afdd4a2abca58d415d7850fdebe1484e1d5a0..9266e8251f9bb4718893c6900b95d1233480c7fc 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepository.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepository.h
@@ -4,7 +4,7 @@
#include <string>
#include <vector>
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidAPI/DllConfig.h"
#include <vector>
@@ -16,7 +16,7 @@ struct ScriptInfo {
/// Identification of the author of the script.
std::string author;
/// Time of the last update of this file (remotelly)
- Kernel::DateAndTime pub_date;
+ Mantid::Types::DateAndTime pub_date;
/// Marked for auto update
bool auto_update;
/// Directory Flag to indicate if the entry is a directory.
diff --git a/Framework/API/src/Algorithm.cpp b/Framework/API/src/Algorithm.cpp
index 22239ea2e19b5fbc61d4647d2ff60a2e76503683..d1bb2f3514a0907953931d8afbae112127640993 100644
--- a/Framework/API/src/Algorithm.cpp
+++ b/Framework/API/src/Algorithm.cpp
@@ -9,7 +9,7 @@
#include "MantidAPI/WorkspaceHistory.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/EmptyValues.h"
#include "MantidKernel/MultiThreaded.h"
#include "MantidKernel/Strings.h"
@@ -437,7 +437,7 @@ bool Algorithm::execute() {
}
notificationCenter().postNotification(new StartedNotification(this));
- Mantid::Kernel::DateAndTime startTime;
+ Mantid::Types::DateAndTime startTime;
// Return a failure if the algorithm hasn't been initialized
if (!isInitialized()) {
@@ -549,7 +549,7 @@ bool Algorithm::execute() {
m_running = true;
}
- startTime = Mantid::Kernel::DateAndTime::getCurrentTime();
+ startTime = Mantid::Types::DateAndTime::getCurrentTime();
// Start a timer
Timer timer;
// Call the concrete algorithm's exec method
@@ -1205,13 +1205,13 @@ bool Algorithm::checkGroups() {
*
* @return whether processGroups succeeds.
*/
-bool Algorithm::doCallProcessGroups(Mantid::Kernel::DateAndTime &startTime) {
+bool Algorithm::doCallProcessGroups(Mantid::Types::DateAndTime &startTime) {
// In the base implementation of processGroups, this normally calls
// this->execute() again on each member of the group. Other algorithms may
// choose to override that behavior (examples: CompareWorkspaces,
// CheckWorkspacesMatch, RenameWorkspace)
- startTime = Mantid::Kernel::DateAndTime::getCurrentTime();
+ startTime = Mantid::Types::DateAndTime::getCurrentTime();
// Start a timer
Timer timer;
diff --git a/Framework/API/src/AlgorithmHistory.cpp b/Framework/API/src/AlgorithmHistory.cpp
index bb8d206656d2401a2562bbd81296eaca847a4124..c3a6e29e05780b110c04fabf22147de17461cd6d 100644
--- a/Framework/API/src/AlgorithmHistory.cpp
+++ b/Framework/API/src/AlgorithmHistory.cpp
@@ -9,7 +9,7 @@ namespace Mantid {
namespace API {
using Kernel::Property;
-using Kernel::DateAndTime;
+using Mantid::Types::DateAndTime;
using Kernel::PropertyHistory;
using Kernel::PropertyHistory_sptr;
using Kernel::PropertyHistory_const_sptr;
@@ -24,7 +24,7 @@ using Kernel::PropertyHistories;
* @param uexeccount :: an unsigned int for algorithm execution order
*/
AlgorithmHistory::AlgorithmHistory(const Algorithm *const alg,
- const Kernel::DateAndTime &start,
+ const Mantid::Types::DateAndTime &start,
const double &duration,
std::size_t uexeccount)
: m_name(alg->name()), m_version(alg->version()), m_executionDate(start),
@@ -49,7 +49,7 @@ AlgorithmHistory::~AlgorithmHistory() = default;
@param uexeccount :: an unsigned int for algorithm execution order
*/
AlgorithmHistory::AlgorithmHistory(const std::string &name, int vers,
- const Kernel::DateAndTime &start,
+ const Mantid::Types::DateAndTime &start,
const double &duration,
std::size_t uexeccount)
: m_name(name), m_version(vers), m_executionDate(start),
@@ -83,7 +83,7 @@ void AlgorithmHistory::setProperties(const Algorithm *const alg) {
* @param uexeccount :: an unsigned int for algorithm execution order
*/
void AlgorithmHistory::fillAlgorithmHistory(const Algorithm *const alg,
- const Kernel::DateAndTime &start,
+ const Mantid::Types::DateAndTime &start,
const double &duration,
std::size_t uexeccount) {
m_name = alg->name();
diff --git a/Framework/API/src/DeprecatedAlgorithm.cpp b/Framework/API/src/DeprecatedAlgorithm.cpp
index fd07ba8e8eeaeb1d7669e12c4a14d8d4713411e4..429dfeeacdc25d60a002308054fd939caf164cff 100644
--- a/Framework/API/src/DeprecatedAlgorithm.cpp
+++ b/Framework/API/src/DeprecatedAlgorithm.cpp
@@ -1,6 +1,6 @@
#include "MantidAPI/DeprecatedAlgorithm.h"
#include "MantidAPI/AlgorithmFactory.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Logger.h"
#include <sstream>
diff --git a/Framework/API/src/ExperimentInfo.cpp b/Framework/API/src/ExperimentInfo.cpp
index 60840c6fa9eeb19c27beffbee3b0d4d36e3d466a..fd571cbd06a63d20359a6ca3b6fece0beb2cea73 100644
--- a/Framework/API/src/ExperimentInfo.cpp
+++ b/Framework/API/src/ExperimentInfo.cpp
@@ -15,9 +15,9 @@
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
+#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Instrument/ParameterFactory.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
-#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidGeometry/Instrument/XMLInstrumentParameter.h"
@@ -26,13 +26,13 @@
#include "MantidBeamline/SpectrumInfo.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/EigenConversionHelpers.h"
-#include "MantidKernel/InstrumentInfo.h"
#include "MantidKernel/IPropertyManager.h"
+#include "MantidKernel/InstrumentInfo.h"
#include "MantidKernel/Property.h"
-#include "MantidKernel/Strings.h"
#include "MantidKernel/StringTokenizer.h"
+#include "MantidKernel/Strings.h"
#include "MantidKernel/make_unique.h"
#include "MantidTypes/SpectrumDefinition.h"
@@ -53,6 +53,7 @@
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
using namespace Poco::XML;
+using namespace Mantid::Types;
namespace Mantid {
@@ -60,7 +61,7 @@ namespace API {
namespace {
/// static logger object
Kernel::Logger g_log("ExperimentInfo");
-}
+} // namespace
/** Constructor
*/
@@ -181,11 +182,11 @@ void checkDetectorInfoSize(const Instrument &instr,
"DetectorInfo and number of detectors in "
"instrument");
}
-}
+} // namespace
/** Set the instrument
-* @param instr :: Shared pointer to an instrument.
-*/
+ * @param instr :: Shared pointer to an instrument.
+ */
void ExperimentInfo::setInstrument(const Instrument_const_sptr &instr) {
m_spectrumInfoWrapper = nullptr;
if (instr->isParametrized()) {
@@ -208,10 +209,10 @@ void ExperimentInfo::setInstrument(const Instrument_const_sptr &instr) {
}
/** Get a shared pointer to the parametrized instrument associated with this
-*workspace
-*
-* @return The instrument class
-*/
+ *workspace
+ *
+ * @return The instrument class
+ */
Instrument_const_sptr ExperimentInfo::getInstrument() const {
populateIfNotLoaded();
checkDetectorInfoSize(*sptr_instrument, detectorInfo());
@@ -220,24 +221,24 @@ Instrument_const_sptr ExperimentInfo::getInstrument() const {
}
/** Returns a new copy of the instrument parameters
-* @return a (new) copy of the instruments parameter map
-*/
+ * @return a (new) copy of the instruments parameter map
+ */
Geometry::ParameterMap &ExperimentInfo::instrumentParameters() {
populateIfNotLoaded();
return *m_parmap;
}
/** Returns a const reference to the instrument parameters.
-* @return a const reference to the instrument ParameterMap.
-*/
+ * @return a const reference to the instrument ParameterMap.
+ */
const Geometry::ParameterMap &ExperimentInfo::instrumentParameters() const {
populateIfNotLoaded();
return *m_parmap;
}
/** Returns a const reference to the instrument parameters.
-* @return a const reference to the instrument ParameterMap.
-*/
+ * @return a const reference to the instrument ParameterMap.
+ */
const Geometry::ParameterMap &
ExperimentInfo::constInstrumentParameters() const {
populateIfNotLoaded();
@@ -283,7 +284,7 @@ struct ParameterValue {
const Run &runData;
};
///@endcond
-}
+} // namespace
namespace {
bool isPositionParameter(const std::string &name) {
@@ -350,14 +351,14 @@ void adjustPositionsFromScaleFactor(ComponentInfo &componentInfo,
applyRectangularDetectorScaleToComponentInfo(
componentInfo, component->getComponentID(), ScaleX, ScaleY);
}
-}
+} // namespace
/** Add parameters to the instrument parameter map that are defined in
-* instrument
-* definition file or parameter file, which may contain parameters that require
-* logfile data to be available. Logs must be loaded before running this
-* method.
-*/
+ * instrument
+ * definition file or parameter file, which may contain parameters that
+ * require logfile data to be available. Logs must be loaded before running this
+ * method.
+ */
void ExperimentInfo::populateInstrumentParameters() {
populateIfNotLoaded();
@@ -591,8 +592,8 @@ ChopperModel &ExperimentInfo::chopperModel(const size_t index) const {
}
/** Get a constant reference to the Sample associated with this workspace.
-* @return const reference to Sample object
-*/
+ * @return const reference to Sample object
+ */
const Sample &ExperimentInfo::sample() const {
populateIfNotLoaded();
std::lock_guard<std::recursive_mutex> lock(m_mutex);
@@ -600,11 +601,11 @@ const Sample &ExperimentInfo::sample() const {
}
/** Get a reference to the Sample associated with this workspace.
-* This non-const method will copy the sample if it is shared between
-* more than one workspace, and the reference returned will be to the copy.
-* Can ONLY be taken by reference!
-* @return reference to sample object
-*/
+ * This non-const method will copy the sample if it is shared between
+ * more than one workspace, and the reference returned will be to the copy.
+ * Can ONLY be taken by reference!
+ * @return reference to sample object
+ */
Sample &ExperimentInfo::mutableSample() {
populateIfNotLoaded();
// Use a double-check for sharing so that we only
@@ -622,8 +623,8 @@ Sample &ExperimentInfo::mutableSample() {
}
/** Get a constant reference to the Run object associated with this workspace.
-* @return const reference to run object
-*/
+ * @return const reference to run object
+ */
const Run &ExperimentInfo::run() const {
populateIfNotLoaded();
std::lock_guard<std::recursive_mutex> lock(m_mutex);
@@ -631,11 +632,11 @@ const Run &ExperimentInfo::run() const {
}
/** Get a reference to the Run object associated with this workspace.
-* This non-const method will copy the Run object if it is shared between
-* more than one workspace, and the reference returned will be to the copy.
-* Can ONLY be taken by reference!
-* @return reference to Run object
-*/
+ * This non-const method will copy the Run object if it is shared between
+ * more than one workspace, and the reference returned will be to the copy.
+ * Can ONLY be taken by reference!
+ * @return reference to Run object
+ */
Run &ExperimentInfo::mutableRun() {
populateIfNotLoaded();
// Use a double-check for sharing so that we only
@@ -749,9 +750,8 @@ Kernel::DeltaEMode::Type ExperimentInfo::getEMode() const {
std::string emodeStr;
if (run().hasProperty(emodeTag)) {
emodeStr = run().getPropertyValueAsType<std::string>(emodeTag);
- } else if (sptr_instrument &&
- constInstrumentParameters().contains(sptr_instrument.get(),
- emodeTag)) {
+ } else if (sptr_instrument && constInstrumentParameters().contains(
+ sptr_instrument.get(), emodeTag)) {
Geometry::Parameter_sptr param =
constInstrumentParameters().get(sptr_instrument.get(), emodeTag);
emodeStr = param->asString();
@@ -865,11 +865,11 @@ class myContentHandler : public Poco::XML::ContentHandler {
};
/** Return from an IDF the values of the valid-from and valid-to attributes
-*
-* @param IDFfilename :: Full path of an IDF
-* @param[out] outValidFrom :: Used to return valid-from date
-* @param[out] outValidTo :: Used to return valid-to date
-*/
+ *
+ * @param IDFfilename :: Full path of an IDF
+ * @param[out] outValidFrom :: Used to return valid-from date
+ * @param[out] outValidTo :: Used to return valid-to date
+ */
void ExperimentInfo::getValidFromTo(const std::string &IDFfilename,
std::string &outValidFrom,
std::string &outValidTo) {
@@ -890,13 +890,13 @@ void ExperimentInfo::getValidFromTo(const std::string &IDFfilename,
}
/** Return workspace start date as an ISO 8601 string. If this info not stored
-*in workspace the
-* method returns current date. This date is used for example to retrieve the
-*instrument file.
-*
-* @return workspace start date as a string (current time if start date not
-*available)
-*/
+ *in workspace the
+ * method returns current date. This date is used for example to retrieve the
+ *instrument file.
+ *
+ * @return workspace start date as a string (current time if start date not
+ *available)
+ */
std::string ExperimentInfo::getWorkspaceStartDate() const {
populateIfNotLoaded();
std::string date;
@@ -905,13 +905,13 @@ std::string ExperimentInfo::getWorkspaceStartDate() const {
} catch (std::runtime_error &) {
g_log.information("run_start/start_time not stored in workspace. Default "
"to current date.");
- date = Kernel::DateAndTime::getCurrentTime().toISO8601String();
+ date = Mantid::Types::DateAndTime::getCurrentTime().toISO8601String();
}
return date;
}
/** Return workspace start date as a formatted string (strftime, as
- * returned by Kernel::DateAndTime) string, if available. If
+ * returned by Mantid::Types::DateAndTime) string, if available. If
* unavailable, an empty string is returned
*
* @return workspace start date as a string (empty if no date available)
@@ -945,24 +945,24 @@ std::string ExperimentInfo::getAvailableWorkspaceEndDate() const {
}
/** A given instrument may have multiple IDFs associated with it. This method
-*return an identifier which identify a given IDF for a given instrument.
-* An IDF filename is required to be of the form IDFname + _Definition +
-*Identifier + .xml, the identifier then is the part of a filename that
-*identifies the IDF valid at a given date.
-*
-* If several IDF files are valid at the given date the file with the most
-*recent from date is selected. If no such files are found the file with the
-*latest from date is selected.
-*
-* If no file is found for the given instrument, an empty string is returned.
-*
-* @param instrumentName :: Instrument name e.g. GEM, TOPAS or BIOSANS
-* @param date :: ISO 8601 date
-* @return full path of IDF
-*
-* @throws Exception::NotFoundError If no valid instrument definition filename is
-* found
-*/
+ *return an identifier which identify a given IDF for a given instrument.
+ * An IDF filename is required to be of the form IDFname + _Definition +
+ *Identifier + .xml, the identifier then is the part of a filename that
+ *identifies the IDF valid at a given date.
+ *
+ * If several IDF files are valid at the given date the file with the most
+ *recent from date is selected. If no such files are found the file with the
+ *latest from date is selected.
+ *
+ * If no file is found for the given instrument, an empty string is returned.
+ *
+ * @param instrumentName :: Instrument name e.g. GEM, TOPAS or BIOSANS
+ * @param date :: ISO 8601 date
+ * @return full path of IDF
+ *
+ * @throws Exception::NotFoundError If no valid instrument definition filename
+ *is found
+ */
std::string
ExperimentInfo::getInstrumentFilename(const std::string &instrumentName,
const std::string &date) {
@@ -970,7 +970,7 @@ ExperimentInfo::getInstrumentFilename(const std::string &instrumentName,
// Just use the current date
g_log.debug() << "No date specified, using current date and time.\n";
const std::string now =
- Kernel::DateAndTime::getCurrentTime().toISO8601String();
+ Mantid::Types::DateAndTime::getCurrentTime().toISO8601String();
// Recursively call this method, but with both parameters.
return ExperimentInfo::getInstrumentFilename(instrumentName, now);
}
@@ -988,17 +988,19 @@ ExperimentInfo::getInstrumentFilename(const std::string &instrumentName,
boost::regex regex(instrument + "_Definition.*\\.xml",
boost::regex_constants::icase);
Poco::DirectoryIterator end_iter;
- DateAndTime d(date);
+ DateAndTime d = DateAndTimeHelpers::createFromISO8601(date);
bool foundGoodFile =
false; // True if we have found a matching file (valid at the given date)
std::string mostRecentIDF; // store most recently starting matching IDF if
// found, else most recently starting IDF.
- DateAndTime refDate("1900-01-31 23:59:00"); // used to help determine the most
- // recently starting IDF, if none
- // match
- DateAndTime refDateGoodFile("1900-01-31 23:59:00"); // used to help determine
- // the most recently
- // starting matching IDF
+ DateAndTime refDate = DateAndTimeHelpers::createFromISO8601(
+ "1900-01-31 23:59:00"); // used to help determine the most
+ // recently starting IDF, if none
+ // match
+ DateAndTime refDateGoodFile = DateAndTimeHelpers::createFromISO8601(
+ "1900-01-31 23:59:00"); // used to help determine
+ // the most recently
+ // starting matching IDF
for (const auto &directoryName : directoryNames) {
// This will iterate around the directories from user ->etc ->install, and
// find the first beat file
@@ -1017,13 +1019,13 @@ ExperimentInfo::getInstrumentFilename(const std::string &instrumentName,
getValidFromTo(pathName, validFrom, validTo);
g_log.debug() << "File '" << pathName << " valid dates: from '"
<< validFrom << "' to '" << validTo << "'\n";
- DateAndTime from(validFrom);
+ DateAndTime from = DateAndTimeHelpers::createFromISO8601(validFrom);
// Use a default valid-to date if none was found.
DateAndTime to;
if (validTo.length() > 0)
- to.setFromISO8601(validTo);
+ DateAndTimeHelpers::setFromISO8601(to, validTo);
else
- to.setFromISO8601("2100-01-01T00:00:00");
+ DateAndTimeHelpers::setFromISO8601(to, "2100-01-01T00:00:00");
if (from <= d && d <= to) {
if (from > refDateGoodFile) { // We'd found a matching file more
diff --git a/Framework/API/src/HistoryView.cpp b/Framework/API/src/HistoryView.cpp
index 2ce8b14cdf14eede7e704d6ca7ea9dcbe248d9cf..0acee9992b532fdb2176fb202eebd5861e10bf6d 100644
--- a/Framework/API/src/HistoryView.cpp
+++ b/Framework/API/src/HistoryView.cpp
@@ -193,12 +193,12 @@ void HistoryView::roll(std::vector<HistoryItem>::iterator &it) {
* @param start Start of time range
* @param end End of time range
*/
-void HistoryView::filterBetweenExecDate(Mantid::Kernel::DateAndTime start,
- Mantid::Kernel::DateAndTime end) {
+void HistoryView::filterBetweenExecDate(Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime end) {
auto lastItem = std::remove_if(
m_historyItems.begin(), m_historyItems.end(),
[&start, &end](const HistoryItem &item) {
- Mantid::Kernel::DateAndTime algExecutionDate =
+ Mantid::Types::DateAndTime algExecutionDate =
item.getAlgorithmHistory()->executionDate();
return algExecutionDate < start || algExecutionDate > end;
});
diff --git a/Framework/API/src/LogManager.cpp b/Framework/API/src/LogManager.cpp
index b652554d51f2b045684c5ddf94ef4846e245dc76..f9b8f6ef751129d2891bb2158947ed228cdd55dc 100644
--- a/Framework/API/src/LogManager.cpp
+++ b/Framework/API/src/LogManager.cpp
@@ -3,9 +3,12 @@
#include "MantidKernel/PropertyManager.h"
#include "MantidKernel/PropertyNexus.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <nexus/NeXusFile.hpp>
+using namespace Mantid::Types;
+
namespace Mantid {
namespace API {
@@ -83,7 +86,7 @@ bool convertPropertyToDouble(const Property *property, double &value,
convertPropertyToDouble<uint64_t>(property, value, function) ||
convertPropertyToDouble<float>(property, value, function);
}
-}
+} // namespace
/// Name of the log entry containing the proton charge when retrieved using
/// getProtonCharge
@@ -95,14 +98,17 @@ const char *LogManager::PROTON_CHARGE_LOG_NAME = "gd_prtn_chrg";
LogManager::LogManager()
: m_manager(Kernel::make_unique<Kernel::PropertyManager>()),
- m_singleValueCache(Kernel::make_unique<Kernel::Cache<
- std::pair<std::string, Kernel::Math::StatisticType>, double>>()) {}
+ m_singleValueCache(
+ Kernel::make_unique<Kernel::Cache<
+ std::pair<std::string, Kernel::Math::StatisticType>, double>>()) {
+}
LogManager::LogManager(const LogManager &other)
: m_manager(Kernel::make_unique<Kernel::PropertyManager>(*other.m_manager)),
- m_singleValueCache(Kernel::make_unique<Kernel::Cache<
- std::pair<std::string, Kernel::Math::StatisticType>, double>>(
- *other.m_singleValueCache)) {}
+ m_singleValueCache(
+ Kernel::make_unique<Kernel::Cache<
+ std::pair<std::string, Kernel::Math::StatisticType>, double>>(
+ *other.m_singleValueCache)) {}
// Defined as default in source for forward declaration with std::unique_ptr.
LogManager::~LogManager() = default;
@@ -116,12 +122,12 @@ LogManager &LogManager::operator=(const LogManager &other) {
}
/**
-* Set the run start and end
-* @param start :: The run start
-* @param end :: The run end
-*/
-void LogManager::setStartAndEndTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &end) {
+ * Set the run start and end
+ * @param start :: The run start
+ * @param end :: The run end
+ */
+void LogManager::setStartAndEndTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &end) {
this->addProperty<std::string>("start_time", start.toISO8601String(), true);
this->addProperty<std::string>("end_time", end.toISO8601String(), true);
}
@@ -133,12 +139,12 @@ void LogManager::setStartAndEndTime(const Kernel::DateAndTime &start,
* @returns The start time of the run
* @throws std::runtime_error if neither property is defined
*/
-const Kernel::DateAndTime LogManager::startTime() const {
+const Mantid::Types::DateAndTime LogManager::startTime() const {
const std::string start_prop("start_time");
if (hasProperty(start_prop)) {
try {
- DateAndTime start_time(getProperty(start_prop)->value());
- if (start_time != DateAndTime::GPS_EPOCH) {
+ DateAndTime start_time = DateAndTimeHelpers::createFromISO8601(getProperty(start_prop)->value());
+ if (start_time != DateAndTimeHelpers::GPS_EPOCH) {
return start_time;
}
} catch (std::invalid_argument &) { /*Swallow and move on*/
@@ -148,8 +154,8 @@ const Kernel::DateAndTime LogManager::startTime() const {
const std::string run_start_prop("run_start");
if (hasProperty(run_start_prop)) {
try {
- DateAndTime start_time(getProperty(run_start_prop)->value());
- if (start_time != DateAndTime::GPS_EPOCH) {
+ DateAndTime start_time = DateAndTimeHelpers::createFromISO8601(getProperty(run_start_prop)->value());
+ if (start_time != DateAndTimeHelpers::GPS_EPOCH) {
return start_time;
}
} catch (std::invalid_argument &) { /*Swallow and move on*/
@@ -165,11 +171,11 @@ const Kernel::DateAndTime LogManager::startTime() const {
* @returns The end time of the run
* @throws std::runtime_error if neither property is defined
*/
-const Kernel::DateAndTime LogManager::endTime() const {
+const Mantid::Types::DateAndTime LogManager::endTime() const {
const std::string end_prop("end_time");
if (hasProperty(end_prop)) {
try {
- return DateAndTime(getProperty(end_prop)->value());
+ return DateAndTimeHelpers::createFromISO8601(getProperty(end_prop)->value());
} catch (std::invalid_argument &) { /*Swallow and move on*/
}
}
@@ -177,7 +183,7 @@ const Kernel::DateAndTime LogManager::endTime() const {
const std::string run_end_prop("run_end");
if (hasProperty(run_end_prop)) {
try {
- return DateAndTime(getProperty(run_end_prop)->value());
+ return DateAndTimeHelpers::createFromISO8601(getProperty(run_end_prop)->value());
} catch (std::invalid_argument &) { /*Swallow and move on*/
}
}
@@ -196,8 +202,8 @@ const Kernel::DateAndTime LogManager::endTime() const {
* @param stop :: Absolute stop time. Any log entries at times < than this time
*are kept.
*/
-void LogManager::filterByTime(const Kernel::DateAndTime start,
- const Kernel::DateAndTime stop) {
+void LogManager::filterByTime(const Mantid::Types::DateAndTime start,
+ const Mantid::Types::DateAndTime stop) {
// The propery manager operator will make all timeseriesproperties filter.
m_manager->filterByTime(start, stop);
}
@@ -239,13 +245,13 @@ void LogManager::filterByLog(const Kernel::TimeSeriesProperty<bool> &filter) {
//-----------------------------------------------------------------------------------------------
/**
- * Add data to the object in the form of a property
- * @param prop :: A pointer to a property whose ownership is transferred to
+ * Add data to the object in the form of a property
+ * @param prop :: A pointer to a property whose ownership is transferred to
* this
- * object
- * @param overwrite :: If true, a current value is overwritten. (Default:
+ * object
+ * @param overwrite :: If true, a current value is overwritten. (Default:
* False)
- */
+ */
void LogManager::addProperty(std::unique_ptr<Kernel::Property> prop,
bool overwrite) {
// Make an exception for the proton charge
@@ -537,10 +543,10 @@ void LogManager::clearLogs() { m_manager->clear(); }
/** @cond */
/// Macro to instantiate concrete template members
#define INSTANTIATE(TYPE) \
- template MANTID_API_DLL Kernel::TimeSeriesProperty<TYPE> * \
- LogManager::getTimeSeriesProperty(const std::string &) const; \
- template MANTID_API_DLL TYPE \
- LogManager::getPropertyValueAsType(const std::string &) const;
+ template MANTID_API_DLL Kernel::TimeSeriesProperty<TYPE> \
+ *LogManager::getTimeSeriesProperty(const std::string &) const; \
+ template MANTID_API_DLL TYPE LogManager::getPropertyValueAsType( \
+ const std::string &) const;
INSTANTIATE(double)
INSTANTIATE(int32_t)
@@ -562,5 +568,5 @@ template MANTID_API_DLL std::vector<long>
LogManager::getPropertyValueAsType(const std::string &) const;
/** @endcond */
-} // API namespace
-}
+} // namespace API
+} // namespace Mantid
diff --git a/Framework/API/src/MatrixWorkspace.cpp b/Framework/API/src/MatrixWorkspace.cpp
index aa0aa5b7009fa702aac8c28e4015a8279b6fdda3..1c122d263005e0b93e86eb886266a3268e4e70b1 100644
--- a/Framework/API/src/MatrixWorkspace.cpp
+++ b/Framework/API/src/MatrixWorkspace.cpp
@@ -18,6 +18,7 @@
#include "MantidKernel/MDUnit.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/make_unique.h"
#include "MantidKernel/VectorHelper.h"
#include "MantidParallel/Communicator.h"
@@ -28,7 +29,7 @@
#include <functional>
#include <numeric>
-using Mantid::Kernel::DateAndTime;
+using namespace Mantid::Types;
using Mantid::Kernel::TimeSeriesProperty;
using Mantid::Kernel::Strings::toString;
@@ -1158,12 +1159,12 @@ size_t MatrixWorkspace::getMemorySizeForXAxes() const {
* @throw invalid_argument if the log is not a double TimeSeriesProperty (should
*be impossible)
*/
-Kernel::DateAndTime MatrixWorkspace::getFirstPulseTime() const {
+Mantid::Types::DateAndTime MatrixWorkspace::getFirstPulseTime() const {
TimeSeriesProperty<double> *log =
this->run().getTimeSeriesProperty<double>("proton_charge");
DateAndTime startDate = log->firstTime();
- DateAndTime reference("1991-01-01T00:00:00");
+ DateAndTime reference = DateAndTimeHelpers::createFromISO8601("1991-01-01T00:00:00");
int i = 0;
// Find the first pulse after 1991
@@ -1184,7 +1185,7 @@ Kernel::DateAndTime MatrixWorkspace::getFirstPulseTime() const {
* @throw invalid_argument if the log is not a double TimeSeriesProperty (should
*be impossible)
*/
-Kernel::DateAndTime MatrixWorkspace::getLastPulseTime() const {
+Mantid::Types::DateAndTime MatrixWorkspace::getLastPulseTime() const {
TimeSeriesProperty<double> *log =
this->run().getTimeSeriesProperty<double>("proton_charge");
return log->lastTime();
diff --git a/Framework/API/src/Run.cpp b/Framework/API/src/Run.cpp
index 05ac954c9ef38a4116ce66c099674a3ef82a9124..b4a215c0aede5e6ab5cbc79f4e724733d19e30a5 100644
--- a/Framework/API/src/Run.cpp
+++ b/Framework/API/src/Run.cpp
@@ -1,6 +1,6 @@
#include "MantidAPI/Run.h"
#include "MantidGeometry/Instrument/Goniometer.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Matrix.h"
#include "MantidKernel/PropertyManager.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -81,8 +81,8 @@ boost::shared_ptr<Run> Run::clone() {
* @param stop :: Absolute stop time. Any log entries at times < than this time
*are kept.
*/
-void Run::filterByTime(const Kernel::DateAndTime start,
- const Kernel::DateAndTime stop) {
+void Run::filterByTime(const Mantid::Types::DateAndTime start,
+ const Mantid::Types::DateAndTime stop) {
LogManager::filterByTime(start, stop);
// Re-integrate proton charge
this->integrateProtonCharge();
diff --git a/Framework/API/src/WorkspaceHistory.cpp b/Framework/API/src/WorkspaceHistory.cpp
index c501aa008a9b9263d4382692491c17dbf854d44c..c87a77a96569d018990f98141693804d83091022 100644
--- a/Framework/API/src/WorkspaceHistory.cpp
+++ b/Framework/API/src/WorkspaceHistory.cpp
@@ -1,10 +1,11 @@
+#include "MantidAPI/WorkspaceHistory.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmHistory.h"
#include "MantidAPI/HistoryView.h"
-#include "MantidAPI/WorkspaceHistory.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/EnvironmentHistory.h"
-#include "MantidKernel/Strings.h"
#include "MantidKernel/StringTokenizer.h"
+#include "MantidKernel/Strings.h"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
@@ -20,7 +21,7 @@ namespace API {
namespace {
/// static logger object
Kernel::Logger g_log("WorkspaceHistory");
-}
+} // namespace
/// Default Constructor
WorkspaceHistory::WorkspaceHistory() : m_environment() {}
@@ -359,12 +360,12 @@ WorkspaceHistory::parseAlgorithmHistory(const std::string &rawData) {
Poco::DateTime start_timedate;
// This is needed by the Poco parsing function
int tzdiff(-1);
- Mantid::Kernel::DateAndTime utc_start;
+ Mantid::Types::DateAndTime utc_start;
if (!Poco::DateTimeParser::tryParse("%Y-%b-%d %H:%M:%S", date + " " + time,
start_timedate, tzdiff)) {
g_log.warning() << "Error parsing start time in algorithm history entry."
<< "\n";
- utc_start = Kernel::DateAndTime::defaultTime();
+ utc_start = Mantid::Types::DateAndTimeHelpers::defaultTime();
}
// Get the duration
getWordsInString(info[EXEC_DUR], dummy, dummy, temp, dummy);
diff --git a/Framework/API/test/AlgorithmHistoryTest.h b/Framework/API/test/AlgorithmHistoryTest.h
index 5798d9547a0eebe8988658201df0a3b472465580..04f8d2c73205b63779d53a7105f7d08e0270dde1 100644
--- a/Framework/API/test/AlgorithmHistoryTest.h
+++ b/Framework/API/test/AlgorithmHistoryTest.h
@@ -205,7 +205,7 @@ private:
// Convert to time_t but assuming the tm is specified in UTC time.
std::time_t execTime_t = Mantid::Kernel::DateAndTime::utc_mktime(timeinfo);
// Create a UTC datetime from it
- Mantid::Kernel::DateAndTime execTime;
+ Mantid::Types::DateAndTime execTime;
execTime.set_from_time_t(execTime_t);
// Not really much to test
diff --git a/Framework/API/test/ExperimentInfoTest.h b/Framework/API/test/ExperimentInfoTest.h
index 342ba8170eebce2f5ff6574a63324f920125ceb1..289d016b0794ea08c7b8d9284e91660c4bc19734 100644
--- a/Framework/API/test/ExperimentInfoTest.h
+++ b/Framework/API/test/ExperimentInfoTest.h
@@ -1,33 +1,34 @@
#ifndef MANTID_API_EXPERIMENTINFOTEST_H_
#define MANTID_API_EXPERIMENTINFOTEST_H_
-#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/ChopperModel.h"
+#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/ModeratorModel.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/Sample.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidGeometry/Instrument/ComponentInfo.h"
-#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/Detector.h"
+#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/SingletonHolder.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Matrix.h"
+#include "MantidKernel/SingletonHolder.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidAPI/FileFinder.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/NexusTestHelper.h"
#include "PropertyManagerHelper.h"
-#include <nexus/NeXusFile.hpp>
#include <nexus/NeXusException.hpp>
+#include <nexus/NeXusFile.hpp>
-#include <cxxtest/TestSuite.h>
-#include <boost/regex.hpp>
#include <Poco/DirectoryIterator.h>
+#include <boost/regex.hpp>
+#include <cxxtest/TestSuite.h>
#include <set>
#include <unordered_map>
@@ -36,6 +37,7 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
using namespace NeXus;
+using namespace Mantid::Types;
class FakeChopper : public Mantid::API::ChopperModel {
public:
@@ -506,12 +508,12 @@ public:
found = l_filenamePart.find("_Definition");
fromToEntry ft;
ft.path = dir_itr->path();
- ft.from.setFromISO8601(validFrom);
+ DateAndTimeHelpers::setFromISO8601(ft.from, validFrom);
// Valid TO is optional
if (validTo.length() > 0)
- ft.to.setFromISO8601(validTo);
+ DateAndTimeHelpers::setFromISO8601(ft.to, validTo);
else
- ft.to.setFromISO8601("2100-01-01T00:00:00");
+ DateAndTimeHelpers::setFromISO8601(ft.to, "2100-01-01T00:00:00");
idfFiles.emplace(l_filenamePart.substr(0, found), ft);
idfIdentifiers.insert(l_filenamePart.substr(0, found));
@@ -521,7 +523,8 @@ public:
// iterator to browse through the multimap: paramInfoFromIDF
std::unordered_multimap<std::string, fromToEntry>::const_iterator it1, it2;
std::pair<std::unordered_multimap<std::string, fromToEntry>::iterator,
- std::unordered_multimap<std::string, fromToEntry>::iterator> ret;
+ std::unordered_multimap<std::string, fromToEntry>::iterator>
+ ret;
for (auto setIt = idfIdentifiers.begin(); setIt != idfIdentifiers.end();
setIt++) {
@@ -712,9 +715,9 @@ public:
}
/**
- * Test declaring an ExperimentInfo property and retrieving as const or
- * non-const
- */
+ * Test declaring an ExperimentInfo property and retrieving as const or
+ * non-const
+ */
void testGetProperty_const_sptr() {
const std::string eiName = "InputEi";
ExperimentInfo_sptr eiInput(new ExperimentInfo());
diff --git a/Framework/API/test/HistoryViewTest.h b/Framework/API/test/HistoryViewTest.h
index 0bdb1d8c670a49db2e35ffe9d1c93381f00f4716..c9bc2627fd5eff49092d43c5cc9c613a8f278eaf 100644
--- a/Framework/API/test/HistoryViewTest.h
+++ b/Framework/API/test/HistoryViewTest.h
@@ -4,10 +4,11 @@
#include <cxxtest/TestSuite.h>
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/HistoryView.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
using namespace Mantid::API;
using namespace Mantid::Kernel;
-using Mantid::Kernel::DateAndTime;
+using namespace Mantid::Types;
class HistoryViewTest : public CxxTest::TestSuite {
@@ -44,7 +45,7 @@ private:
private:
AlgorithmHistory_sptr
createFromTestAlg(const std::string &name,
- DateAndTime execTime = DateAndTime::defaultTime()) {
+ DateAndTime execTime = DateAndTimeHelpers::defaultTime()) {
testalg alg;
alg.initialize();
alg.setPropertyValue("name", name);
diff --git a/Framework/API/test/LiveListenerTest.h b/Framework/API/test/LiveListenerTest.h
index 6d7b0e4ea25e4543cdbb9ce0b23de50ca2ceedce..4e02e933e12b07f4ee94fababd0e0516a54371fc 100644
--- a/Framework/API/test/LiveListenerTest.h
+++ b/Framework/API/test/LiveListenerTest.h
@@ -19,7 +19,7 @@ public:
MOCK_CONST_METHOD0(supportsHistory, bool());
MOCK_CONST_METHOD0(buffersEvents, bool());
MOCK_METHOD1(connect, bool(const Poco::Net::SocketAddress &));
- MOCK_METHOD1(start, void(Mantid::Kernel::DateAndTime));
+ MOCK_METHOD1(start, void(Mantid::Types::DateAndTime));
MOCK_METHOD0(extractData, boost::shared_ptr<Mantid::API::Workspace>());
MOCK_METHOD0(isConnected, bool());
MOCK_METHOD0(runStatus, RunStatus());
diff --git a/Framework/API/test/LogFilterGeneratorTest.h b/Framework/API/test/LogFilterGeneratorTest.h
index 19b0cbcd92707d0c96489f7006ad73f6d809f811..0fd7dcd4669b27abcbc2b4c937746d0b9464b84a 100644
--- a/Framework/API/test/LogFilterGeneratorTest.h
+++ b/Framework/API/test/LogFilterGeneratorTest.h
@@ -6,18 +6,20 @@
#include "MantidAPI/LogFilterGenerator.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/make_unique.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/make_unique.h"
#include "MantidTestHelpers/FakeObjects.h"
+#include "MantidTypes/DateAndTime.h"
#include <numeric>
-using Mantid::API::MatrixWorkspace_sptr;
using Mantid::API::LogFilterGenerator;
-using Mantid::Kernel::DateAndTime;
+using Mantid::API::MatrixWorkspace_sptr;
using Mantid::Kernel::LogFilter;
using Mantid::Kernel::TimeSeriesProperty;
+using Mantid::Types::DateAndTime;
+using namespace Mantid::Types;
class LogFilterGeneratorTest : public CxxTest::TestSuite {
public:
@@ -65,9 +67,12 @@ public:
TS_ASSERT(filter->filter());
const auto &resultMap = filter->filter()->valueAsCorrectMap();
std::map<DateAndTime, bool> expected;
- expected.emplace(DateAndTime("2007-11-30T16:17:00"), true);
- expected.emplace(DateAndTime("2007-11-30T16:17:30"), false);
- expected.emplace(DateAndTime("2007-11-30T16:18:00"), true);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"), true);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"), false);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"), true);
TS_ASSERT_EQUALS(resultMap.size(), 3);
TS_ASSERT_EQUALS(resultMap, expected);
}
@@ -89,8 +94,10 @@ public:
const auto &values = filter->filter()->valueAsCorrectMap();
TS_ASSERT(!values.empty());
std::map<DateAndTime, bool> expected;
- expected.emplace(DateAndTime("2007-11-30T16:18:20"), true);
- expected.emplace(DateAndTime("2007-11-30T16:18:50"), false);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:20"), true);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"), false);
TS_ASSERT_EQUALS(expected, values);
}
@@ -111,11 +118,16 @@ public:
// 16:18:00 T F F
// 16:18:20 T T T
// 16:18:50 T F F
- expected.emplace(DateAndTime("2007-11-30T16:17:00"), false);
- expected.emplace(DateAndTime("2007-11-30T16:17:30"), false);
- expected.emplace(DateAndTime("2007-11-30T16:18:00"), false);
- expected.emplace(DateAndTime("2007-11-30T16:18:20"), true);
- expected.emplace(DateAndTime("2007-11-30T16:18:50"), false);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"), false);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"), false);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"), false);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:20"), true);
+ expected.emplace(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"), false);
TS_ASSERT_EQUALS(expected, values);
}
@@ -142,7 +154,8 @@ private:
auto log =
Mantid::Kernel::make_unique<TimeSeriesProperty<double>>("TestLog");
constexpr size_t logSize(12);
- const DateAndTime initialTime("2007-11-30T16:17:00");
+ const DateAndTime initialTime =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<DateAndTime> times;
std::vector<double> values;
times.reserve(logSize);
diff --git a/Framework/API/test/LogManagerTest.h b/Framework/API/test/LogManagerTest.h
index ec4b9deeb8c0ee8141a003f8057ec030cdb6ea7b..208688e90ec4f7e03cfd2d7090ffa29ba7637359 100644
--- a/Framework/API/test/LogManagerTest.h
+++ b/Framework/API/test/LogManagerTest.h
@@ -2,19 +2,21 @@
#define LOG_MANAGER_TEST_H_
#include "MantidAPI/LogManager.h"
+#include "MantidGeometry/Instrument/Goniometer.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Matrix.h"
#include "MantidKernel/Property.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/V3D.h"
-#include <cxxtest/TestSuite.h>
#include "MantidTestHelpers/NexusTestHelper.h"
-#include "MantidGeometry/Instrument/Goniometer.h"
#include <cmath>
+#include <cxxtest/TestSuite.h>
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Geometry;
+using namespace Mantid::Types;
// Helper class
namespace {
@@ -52,7 +54,7 @@ void addTestTimeSeries(LogManager &run, const std::string &name) {
timeSeries->addValue("2012-07-19T16:19:20", 24);
run.addProperty(timeSeries);
}
-}
+} // namespace
void addTimeSeriesEntry(LogManager &runInfo, std::string name, double val) {
TimeSeriesProperty<double> *tsp;
@@ -102,17 +104,20 @@ public:
auto run_start_prop =
new PropertyWithValue<std::string>("run_start", run_start);
runInfo.addProperty(run_start_prop);
- TS_ASSERT_EQUALS(runInfo.startTime(), DateAndTime(run_start));
+ TS_ASSERT_EQUALS(runInfo.startTime(),
+ DateAndTimeHelpers::createFromISO8601(run_start));
// Add start_time and see that get picked up in preference
const std::string start_time("2013-12-19T13:40:00");
auto start_time_prop =
new PropertyWithValue<std::string>("start_time", start_time);
runInfo.addProperty(start_time_prop);
- TS_ASSERT_EQUALS(runInfo.startTime(), DateAndTime(start_time));
+ TS_ASSERT_EQUALS(runInfo.startTime(),
+ DateAndTimeHelpers::createFromISO8601(start_time));
// But get back run_start again if start_time is equal to the epoch
const std::string epoch("1990-01-01T00:00:00");
start_time_prop->setValue(epoch);
- TS_ASSERT_EQUALS(runInfo.startTime(), DateAndTime(run_start));
+ TS_ASSERT_EQUALS(runInfo.startTime(),
+ DateAndTimeHelpers::createFromISO8601(run_start));
// And back to failure if they're both that
run_start_prop->setValue(epoch);
TS_ASSERT_THROWS(runInfo.startTime(), std::runtime_error);
@@ -120,11 +125,13 @@ public:
// Set run_start back to valid value and make start_time contain nonsense
run_start_prop->setValue(run_start);
start_time_prop->setValue("__");
- TS_ASSERT_EQUALS(runInfo.startTime(), DateAndTime(run_start));
+ TS_ASSERT_EQUALS(runInfo.startTime(),
+ DateAndTimeHelpers::createFromISO8601(run_start));
// Now make start_time a completely different property type
runInfo.removeProperty("start_time");
runInfo.addProperty(new PropertyWithValue<double>("start_time", 3.33));
- TS_ASSERT_EQUALS(runInfo.startTime(), DateAndTime(run_start));
+ TS_ASSERT_EQUALS(runInfo.startTime(),
+ DateAndTimeHelpers::createFromISO8601(run_start));
// Now make run_start something invalid
run_start_prop->setValue("notADate");
TS_ASSERT_THROWS(runInfo.startTime(), std::runtime_error);
@@ -142,22 +149,26 @@ public:
const std::string run_end("2013-12-19T13:38:00");
auto run_end_prop = new PropertyWithValue<std::string>("run_end", run_end);
runInfo.addProperty(run_end_prop);
- TS_ASSERT_EQUALS(runInfo.endTime(), DateAndTime(run_end));
+ TS_ASSERT_EQUALS(runInfo.endTime(),
+ DateAndTimeHelpers::createFromISO8601(run_end));
// Add end_time and see that get picked up in preference
const std::string end_time("2013-12-19T13:40:00");
auto end_time_prop =
new PropertyWithValue<std::string>("end_time", end_time);
runInfo.addProperty(end_time_prop);
- TS_ASSERT_EQUALS(runInfo.endTime(), DateAndTime(end_time));
+ TS_ASSERT_EQUALS(runInfo.endTime(),
+ DateAndTimeHelpers::createFromISO8601(end_time));
// Set run_end back to valid value and make end_time contain nonsense
run_end_prop->setValue(run_end);
end_time_prop->setValue("__");
- TS_ASSERT_EQUALS(runInfo.endTime(), DateAndTime(run_end));
+ TS_ASSERT_EQUALS(runInfo.endTime(),
+ DateAndTimeHelpers::createFromISO8601(run_end));
// Now make end_time a completely different property type
runInfo.removeProperty("end_time");
runInfo.addProperty(new PropertyWithValue<double>("end_time", 3.33));
- TS_ASSERT_EQUALS(runInfo.endTime(), DateAndTime(run_end));
+ TS_ASSERT_EQUALS(runInfo.endTime(),
+ DateAndTimeHelpers::createFromISO8601(run_end));
// Now make run_end something invalid
run_end_prop->setValue("notADate");
TS_ASSERT_THROWS(runInfo.endTime(), std::runtime_error);
diff --git a/Framework/API/test/MatrixWorkspaceTest.h b/Framework/API/test/MatrixWorkspaceTest.h
index f20f9fcc2fbdf9215f158da856ec2397665cd02a..063ec2b844c6b3e0742d1dc3d6e757e53a324639 100644
--- a/Framework/API/test/MatrixWorkspaceTest.h
+++ b/Framework/API/test/MatrixWorkspaceTest.h
@@ -9,20 +9,21 @@
#include "MantidAPI/SpectrumDetectorMapping.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/ComponentInfo.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/DetectorInfo.h"
-#include "MantidGeometry/Instrument.h"
-#include "MantidKernel/make_cow.h"
+#include "MantidIndexing/IndexInfo.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/VMD.h"
-#include "MantidTypes/SpectrumDefinition.h"
-#include "MantidIndexing/IndexInfo.h"
+#include "MantidKernel/make_cow.h"
+#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/FakeObjects.h"
#include "MantidTestHelpers/InstrumentCreationHelper.h"
-#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/NexusTestHelper.h"
#include "MantidTestHelpers/ParallelRunner.h"
+#include "MantidTypes/SpectrumDefinition.h"
#include "PropertyManagerHelper.h"
#include <cxxtest/TestSuite.h>
@@ -41,6 +42,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Geometry;
using Mantid::Indexing::IndexInfo;
+using namespace Mantid::Types;
// Declare into the factory.
DECLARE_WORKSPACE(WorkspaceTester)
@@ -98,7 +100,7 @@ void run_legacy_setting_spectrum_numbers_with_MPI(
}
}
}
-}
+} // namespace
class MatrixWorkspaceTest : public CxxTest::TestSuite {
public:
@@ -1011,7 +1013,8 @@ public:
void test_getFirstPulseTime_getLastPulseTime() {
WorkspaceTester ws;
auto proton_charge = new TimeSeriesProperty<double>("proton_charge");
- DateAndTime startTime("2013-04-21T10:40:00");
+ DateAndTime startTime =
+ DateAndTimeHelpers::createFromISO8601("2013-04-21T10:40:00");
proton_charge->addValue(startTime, 1.0E-7);
proton_charge->addValue(startTime + 1.0, 2.0E-7);
proton_charge->addValue(startTime + 2.0, 3.0E-7);
@@ -1025,7 +1028,8 @@ public:
void test_getFirstPulseTime_getLastPulseTime_SNS1990bug() {
WorkspaceTester ws;
auto proton_charge = new TimeSeriesProperty<double>("proton_charge");
- DateAndTime startTime("1990-12-31T23:59:00");
+ DateAndTime startTime =
+ DateAndTimeHelpers::createFromISO8601("1990-12-31T23:59:00");
proton_charge->addValue(startTime, 1.0E-7);
proton_charge->addValue(startTime + 1.0, 2.0E-7);
ws.mutableRun().addLogData(proton_charge);
@@ -1037,8 +1041,9 @@ public:
for (int i = 2; i < 62; ++i) {
proton_charge->addValue(startTime + static_cast<double>(i), 1.0E-7);
}
- TS_ASSERT_EQUALS(ws.getFirstPulseTime(),
- DateAndTime("1991-01-01T00:00:00"));
+ TS_ASSERT_EQUALS(
+ ws.getFirstPulseTime(),
+ DateAndTimeHelpers::createFromISO8601("1991-01-01T00:00:00"));
}
void
@@ -1531,8 +1536,8 @@ public:
}
/**
- * Test declaring an input workspace and retrieving as const_sptr or sptr
- */
+ * Test declaring an input workspace and retrieving as const_sptr or sptr
+ */
void testGetProperty_const_sptr() {
const std::string wsName = "InputWorkspace";
MatrixWorkspace_sptr wsInput = boost::make_shared<WorkspaceTester>();
@@ -1587,8 +1592,9 @@ public:
ws.setSharedDx(workspaceIndexWithDx[2], dxSpec2);
// Assert
- auto compareValue =
- [&values](double data, size_t index) { return data == values[index]; };
+ auto compareValue = [&values](double data, size_t index) {
+ return data == values[index];
+ };
for (auto &index : workspaceIndexWithDx) {
TSM_ASSERT("Should have x resolution values", ws.hasDx(index));
TSM_ASSERT_EQUALS("Should have a length of 3", ws.dataDx(index).size(),
diff --git a/Framework/API/test/WorkspaceHistoryIOTest.h b/Framework/API/test/WorkspaceHistoryIOTest.h
index 8e61e31858c93046c8f45a6b692b9b023f938828..a06d58d794625f84403055eb508347f866ff873a 100644
--- a/Framework/API/test/WorkspaceHistoryIOTest.h
+++ b/Framework/API/test/WorkspaceHistoryIOTest.h
@@ -1,18 +1,20 @@
#ifndef WORKSPACEHISTORYIOTEST_H_
#define WORKSPACEHISTORYIOTEST_H_
-#include <cxxtest/TestSuite.h>
-#include "MantidAPI/WorkspaceHistory.h"
-#include "MantidAPI/AlgorithmHistory.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmFactory.h"
+#include "MantidAPI/AlgorithmHistory.h"
#include "MantidAPI/FileFinder.h"
+#include "MantidAPI/WorkspaceHistory.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Property.h"
#include "MantidTestHelpers/NexusTestHelper.h"
#include "Poco/File.h"
+#include <cxxtest/TestSuite.h>
using namespace Mantid::API;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class WorkspaceHistoryIOTest : public CxxTest::TestSuite {
private:
@@ -205,7 +207,7 @@ public:
WorkspaceHistory testHistory;
for (int i = 1; i < 5; i++) {
AlgorithmHistory algHist("History" + boost::lexical_cast<std::string>(i),
- 1, DateAndTime::defaultTime(), -1.0, i);
+ 1, DateAndTimeHelpers::defaultTime(), -1.0, i);
testHistory.addHistory(boost::make_shared<AlgorithmHistory>(algHist));
}
@@ -241,10 +243,10 @@ public:
void test_SaveNexus_NestedHistory() {
WorkspaceHistory testHistory;
- AlgorithmHistory algHist("ParentHistory", 1, DateAndTime::defaultTime(),
- -1.0, 0);
- AlgorithmHistory childHist("ChildHistory", 1, DateAndTime::defaultTime(),
- -1.0, 1);
+ AlgorithmHistory algHist("ParentHistory", 1,
+ DateAndTimeHelpers::defaultTime(), -1.0, 0);
+ AlgorithmHistory childHist("ChildHistory", 1,
+ DateAndTimeHelpers::defaultTime(), -1.0, 1);
algHist.addChildHistory(boost::make_shared<AlgorithmHistory>(childHist));
testHistory.addHistory(boost::make_shared<AlgorithmHistory>(algHist));
@@ -322,7 +324,8 @@ public:
TS_ASSERT_EQUALS("LoadRaw", history->name());
TS_ASSERT_EQUALS(3, history->version());
- TS_ASSERT_EQUALS(DateAndTime("2009-10-09T16:56:54"),
+ TS_ASSERT_EQUALS(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2009-10-09T16:56:54"),
history->executionDate());
TS_ASSERT_EQUALS(2.3, history->executionDuration());
loadhandle->close();
diff --git a/Framework/API/test/WorkspaceHistoryTest.h b/Framework/API/test/WorkspaceHistoryTest.h
index e0fce1bca6aae08e835903dc8c63f0499715b352..36066b77165a2b1e41a5eaead6f78752be186fdf 100644
--- a/Framework/API/test/WorkspaceHistoryTest.h
+++ b/Framework/API/test/WorkspaceHistoryTest.h
@@ -1,15 +1,16 @@
#ifndef WORKSPACEHISTORYTEST_H_
#define WORKSPACEHISTORYTEST_H_
-#include <cxxtest/TestSuite.h>
-#include "MantidAPI/WorkspaceHistory.h"
-#include "MantidAPI/AlgorithmHistory.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmFactory.h"
+#include "MantidAPI/AlgorithmHistory.h"
#include "MantidAPI/FileFinder.h"
+#include "MantidAPI/WorkspaceHistory.h"
#include "MantidKernel/Property.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidTestHelpers/NexusTestHelper.h"
#include "Poco/File.h"
+#include <cxxtest/TestSuite.h>
using namespace Mantid::API;
using namespace Mantid::Kernel;
@@ -100,10 +101,10 @@ public:
simplesum2.execute();
WorkspaceHistory history;
- AlgorithmHistory alg1(&simplesum,
- Mantid::Kernel::DateAndTime::defaultTime(), 1.0, 0);
- AlgorithmHistory alg2(&simplesum2,
- Mantid::Kernel::DateAndTime::defaultTime(), 1.0, 1);
+ AlgorithmHistory alg1(
+ &simplesum, Mantid::Types::DateAndTimeHelpers::defaultTime(), 1.0, 0);
+ AlgorithmHistory alg2(
+ &simplesum2, Mantid::Types::DateAndTimeHelpers::defaultTime(), 1.0, 1);
history.addHistory(boost::make_shared<AlgorithmHistory>(alg1));
history.addHistory(boost::make_shared<AlgorithmHistory>(alg2));
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h b/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
index c6d6f9a6b0d2c1a67df1cdeed4e82183003cc3dd..9bd46a492a64a04836a97c39ecc02775e0bcad71 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
@@ -85,7 +85,7 @@ private:
bool value_is_int);
/// get run start time
- Kernel::DateAndTime getRunStart(API::Run &run_obj);
+ Mantid::Types::DateAndTime getRunStart(API::Run &run_obj);
/// get value vector of the integer TimeSeriesProperty entries
std::vector<int> getIntValues(API::MatrixWorkspace_const_sptr dataws,
@@ -96,7 +96,7 @@ private:
int workspace_index);
/// get the vector of times of the TimeSeriesProperty entries
- std::vector<Kernel::DateAndTime>
+ std::vector<Mantid::Types::DateAndTime>
getTimes(API::MatrixWorkspace_const_sptr dataws, int workspace_index,
bool is_epoch, bool is_second, API::Run &run_obj);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateCountRate.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateCountRate.h
index 3efe13216946e866559fb6312226241ac2a64301..135d919fe5c91d41bc9f67cc72f76d50864a8880 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateCountRate.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateCountRate.h
@@ -79,7 +79,7 @@ protected: // for testing, actually private
/// spurion search ranges (TOF or other units requested)
double m_XRangeMin{0}, m_XRangeMax{0};
/// experiment time ranges:
- Kernel::DateAndTime m_TRangeMin{0}, m_TRangeMax{0};
+ Mantid::Types::DateAndTime m_TRangeMin{0}, m_TRangeMax{0};
/// temporary workspace used to keep intermediate results
DataObjects::EventWorkspace_sptr m_workingWS;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h b/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
index 3206750a8ac63cea87dd9eefb86693a7cf684182..518cf8225d5c91d11928aaa9d48acd9bdf285529 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
@@ -42,7 +42,7 @@ private:
void shiftTimeOfLogs(Mantid::API::MatrixWorkspace_sptr ws, double timeShift,
double startProgress, double stopProgress);
/// Get the date and time of the first good frame of a workspace
- Mantid::Kernel::DateAndTime
+ Mantid::Types::DateAndTime
getStartTimeFromWorkspace(Mantid::API::MatrixWorkspace_sptr ws) const;
/// Can the string be transformed to double
bool checkForDouble(std::string val) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h b/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h
index d3cd1d40edc415f77a6c9d66829863a276ce7071..601f656c918a5b827835c5965c78941d8353caba 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h
@@ -58,16 +58,16 @@ private:
std::vector<int64_t> mSETimes;
std::vector<double> mSEValues;
- Kernel::DateAndTime mRunStartTime;
- Kernel::DateAndTime mFilterT0;
- Kernel::DateAndTime mFilterTf;
+ Mantid::Types::DateAndTime mRunStartTime;
+ Mantid::Types::DateAndTime mFilterT0;
+ Mantid::Types::DateAndTime mFilterTf;
void init() override;
void exec() override;
bool
- calculateTimeSeriesRangeByTime(std::vector<Kernel::DateAndTime> &vec_times,
+ calculateTimeSeriesRangeByTime(std::vector<Mantid::Types::DateAndTime> &vec_times,
const double &rel_start_time, size_t &i_start,
const double &rel_stop_time, size_t &i_stop,
const double &time_factor);
@@ -79,11 +79,11 @@ private:
void setupEventWorkspace(const size_t &start_index, const size_t &stop_index,
int numentries,
- std::vector<Kernel::DateAndTime> ×,
+ std::vector<Mantid::Types::DateAndTime> ×,
std::vector<double> values, const bool &epochtime);
void setupWorkspace2D(const size_t &start_index, const size_t &stop_index,
- int numentries, std::vector<Kernel::DateAndTime> ×,
+ int numentries, std::vector<Mantid::Types::DateAndTime> ×,
std::vector<double> values, const bool &epochtime,
const double &timeunitfactor, size_t nspec);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h
index 241079a3abd9b06372794333bba1e8b8b0bb4bb3..1def11c452d806eae39bd176b84fd880e4c5b4ce 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h
@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
index 94aaacb94043a7a54bcaf66edeb4569619aee211..3c3304368137c6e619a4d2d97d82429f20deaa08 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
@@ -158,12 +158,12 @@ private:
template <typename TYPE>
void
splitTimeSeriesProperty(Kernel::TimeSeriesProperty<TYPE> *tsp,
- std::vector<Kernel::DateAndTime> &split_datetime_vec,
+ std::vector<Mantid::Types::DateAndTime> &split_datetime_vec,
const int max_target_index);
void splitDoubleTimeSeriesLogs(
const std::vector<Kernel::TimeSeriesProperty<double> *> &dbl_tsp_vector,
- std::vector<Kernel::DateAndTime> &split_datetime_vec,
+ std::vector<Mantid::Types::DateAndTime> &split_datetime_vec,
const int max_target_index);
void groupOutputWorkspace();
@@ -233,9 +233,9 @@ private:
// Flag to have relative time in splitters workspace
bool m_isSplittersRelativeTime;
// Starting time for starting time of event filters
- Kernel::DateAndTime m_filterStartTime;
+ Mantid::Types::DateAndTime m_filterStartTime;
// EventWorkspace (aka. run)'s starting time
- Kernel::DateAndTime m_runStartTime;
+ Mantid::Types::DateAndTime m_runStartTime;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h b/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
index 069def87f4f05c7a2787bc0d256cc3e97336ba16..e0f13dfb583554828bc2b534161ad7c7ffc78c35 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
@@ -1,12 +1,12 @@
#ifndef MANTID_ALGORITHMS_GENERATEEVENTSFILTER_H_
#define MANTID_ALGORITHMS_GENERATEEVENTSFILTER_H_
-#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
+#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidDataObjects/EventWorkspace.h"
-#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidDataObjects/SplittersWorkspace.h"
-#include "MantidAPI/ITableWorkspace_fwd.h"
+#include "MantidKernel/System.h"
+#include "MantidKernel/TimeSeriesProperty.h"
namespace Mantid {
namespace Algorithms {
@@ -101,50 +101,55 @@ private:
void makeFilterBySingleValue(double min, double max, double TimeTolerance,
bool centre, bool filterIncrease,
bool filterDecrease,
- Kernel::DateAndTime startTime,
- Kernel::DateAndTime stopTime, int wsindex);
+ Mantid::Types::DateAndTime startTime,
+ Mantid::Types::DateAndTime stopTime,
+ int wsindex);
/// Make multiple-log-value filters in serial
void makeMultipleFiltersByValues(std::map<size_t, int> indexwsindexmap,
std::vector<double> logvalueranges,
bool centre, bool filterIncrease,
bool filterDecrease,
- Kernel::DateAndTime startTime,
- Kernel::DateAndTime stopTime);
+ Mantid::Types::DateAndTime startTime,
+ Mantid::Types::DateAndTime stopTime);
/// Make multiple-log-value filters in serial in parallel
void makeMultipleFiltersByValuesParallel(
std::map<size_t, int> indexwsindexmap, std::vector<double> logvalueranges,
bool centre, bool filterIncrease, bool filterDecrease,
- Kernel::DateAndTime startTime, Kernel::DateAndTime stopTime);
+ Mantid::Types::DateAndTime startTime,
+ Mantid::Types::DateAndTime stopTime);
/// Generate event splitters for partial sample log (serial)
void makeMultipleFiltersByValuesPartialLog(
- int istart, int iend, std::vector<Kernel::DateAndTime> &vecSplitTime,
+ int istart, int iend,
+ std::vector<Mantid::Types::DateAndTime> &vecSplitTime,
std::vector<int> &vecSplitGroup, std::map<size_t, int> indexwsindexmap,
- const std::vector<double> &logvalueranges, Kernel::time_duration tol,
- bool filterIncrease, bool filterDecrease, Kernel::DateAndTime startTime,
- Kernel::DateAndTime stopTime);
+ const std::vector<double> &logvalueranges,
+ Mantid::Types::time_duration tol, bool filterIncrease,
+ bool filterDecrease, Mantid::Types::DateAndTime startTime,
+ Mantid::Types::DateAndTime stopTime);
/// Generate event filters for integer sample log
void processIntegerValueFilter(int minvalue, int maxvalue,
bool filterIncrease, bool filterDecrease,
- Kernel::DateAndTime runend);
+ Mantid::Types::DateAndTime runend);
/// Search a value in a sorted vector
size_t searchValue(const std::vector<double> &sorteddata, double value);
/// Add a splitter
- void addNewTimeFilterSplitter(Kernel::DateAndTime starttime,
- Kernel::DateAndTime stoptime, int wsindex,
- std::string info);
+ void addNewTimeFilterSplitter(Mantid::Types::DateAndTime starttime,
+ Mantid::Types::DateAndTime stoptime,
+ int wsindex, std::string info);
/// Create a splitter and add to the vector of time splitters
- Kernel::DateAndTime
- makeSplitterInVector(std::vector<Kernel::DateAndTime> &vecSplitTime,
+ Mantid::Types::DateAndTime
+ makeSplitterInVector(std::vector<Mantid::Types::DateAndTime> &vecSplitTime,
std::vector<int> &vecGroupIndex,
- Kernel::DateAndTime start, Kernel::DateAndTime stop,
- int group, int64_t tol_ns, Kernel::DateAndTime lasttime);
+ Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop, int group,
+ int64_t tol_ns, Mantid::Types::DateAndTime lasttime);
/// Generate a matrix workspace containing splitters
void generateSplittersInMatrixWorkspace();
@@ -156,18 +161,19 @@ private:
void generateSplittersInSplitterWS();
/// Identify the a sample log entry is within intended value and time region
- bool identifyLogEntry(const int &index, const Kernel::DateAndTime &currT,
+ bool identifyLogEntry(const int &index,
+ const Mantid::Types::DateAndTime &currT,
const bool &lastgood, const double &minvalue,
const double &maxvalue,
- const Kernel::DateAndTime &startT,
- const Kernel::DateAndTime &stopT,
+ const Mantid::Types::DateAndTime &startT,
+ const Mantid::Types::DateAndTime &stopT,
const bool &filterIncrease, const bool &filterDecrease);
/// Determine the chaning direction of log value
int determineChangingDirection(int startindex);
/// Find the end of the run
- Kernel::DateAndTime findRunEnd();
+ Mantid::Types::DateAndTime findRunEnd();
DataObjects::EventWorkspace_const_sptr m_dataWS;
@@ -178,11 +184,11 @@ private:
API::ITableWorkspace_sptr m_filterInfoWS;
- Kernel::DateAndTime m_startTime;
- Kernel::DateAndTime m_stopTime;
+ Mantid::Types::DateAndTime m_startTime;
+ Mantid::Types::DateAndTime m_stopTime;
/// Run end time
- Kernel::DateAndTime m_runEndTime;
+ Mantid::Types::DateAndTime m_runEndTime;
double m_timeUnitConvertFactorToNS;
@@ -198,13 +204,13 @@ private:
/// SplitterType
Kernel::TimeSplitterType m_splitters;
/// Vector as date and time
- std::vector<Kernel::DateAndTime> m_vecSplitterTime;
+ std::vector<Mantid::Types::DateAndTime> m_vecSplitterTime;
std::vector<int> m_vecSplitterGroup;
/// Processing algorithm type
bool m_useParallel;
- std::vector<std::vector<Kernel::DateAndTime>> m_vecSplitterTimeSet;
+ std::vector<std::vector<Mantid::Types::DateAndTime>> m_vecSplitterTimeSet;
std::vector<std::vector<int>> m_vecGroupIndexSet;
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h b/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h
index 439044fb6eb1c3cc144cbee0fa42152c7c6dbb8d..5814b1ed3db10098326eaa19db79c592825def5e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h
@@ -57,19 +57,19 @@ public:
private:
API::MatrixWorkspace_sptr m_dataWS;
- Kernel::DateAndTime mRunStartTime;
- Kernel::DateAndTime mFilterT0;
- Kernel::DateAndTime mFilterTf;
+ Mantid::Types::DateAndTime mRunStartTime;
+ Mantid::Types::DateAndTime mFilterT0;
+ Mantid::Types::DateAndTime mFilterTf;
std::map<std::string, std::size_t> m_intInfoMap;
std::map<std::string, double> m_dblInfoMap;
Kernel::TimeSeriesProperty<double> *m_log;
- std::vector<Kernel::DateAndTime> m_timeVec;
+ std::vector<Mantid::Types::DateAndTime> m_timeVec;
std::vector<double> m_valueVec;
- Kernel::DateAndTime m_starttime;
- Kernel::DateAndTime m_endtime;
+ Mantid::Types::DateAndTime m_starttime;
+ Mantid::Types::DateAndTime m_endtime;
bool m_ignoreNegativeTime;
@@ -85,24 +85,24 @@ private:
/// Calcualte the distribution of delta T in time stamps
DataObjects::Workspace2D_sptr
- calDistributions(std::vector<Kernel::DateAndTime> timevec, double stepsize);
+ calDistributions(std::vector<Mantid::Types::DateAndTime> timevec, double stepsize);
void exportLog(API::MatrixWorkspace_sptr ws,
- std::vector<Kernel::DateAndTime> abstimevec, double dts);
+ std::vector<Mantid::Types::DateAndTime> abstimevec, double dts);
void setupEventWorkspace(int numentries,
- std::vector<Kernel::DateAndTime> ×,
+ std::vector<Mantid::Types::DateAndTime> ×,
std::vector<double> values);
- void setupWorkspace2D(int numentries, std::vector<Kernel::DateAndTime> ×,
+ void setupWorkspace2D(int numentries, std::vector<Mantid::Types::DateAndTime> ×,
std::vector<double> values);
void execQuickStatistics();
void exportErrorLog(API::MatrixWorkspace_sptr ws,
- std::vector<Kernel::DateAndTime> abstimevec, double dts);
+ std::vector<Mantid::Types::DateAndTime> abstimevec, double dts);
- void checkLogValueChanging(std::vector<Kernel::DateAndTime> timevec,
+ void checkLogValueChanging(std::vector<Mantid::Types::DateAndTime> timevec,
std::vector<double> values, double delta);
void checkLogBasicInforamtion();
@@ -110,9 +110,9 @@ private:
/// Generate statistic information table workspace
DataObjects::TableWorkspace_sptr generateStatisticTable();
- Kernel::DateAndTime getAbsoluteTime(double abstimens);
+ Mantid::Types::DateAndTime getAbsoluteTime(double abstimens);
- Kernel::DateAndTime calculateRelativeTime(double deltatime);
+ Mantid::Types::DateAndTime calculateRelativeTime(double deltatime);
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/src/AddLogDerivative.cpp b/Framework/Algorithms/src/AddLogDerivative.cpp
index b85b5342960eaf3c91d11607d1d5f70f9e097dae..6827ef76f2b59beaf160fd9cb80871e6155b4a2d 100644
--- a/Framework/Algorithms/src/AddLogDerivative.cpp
+++ b/Framework/Algorithms/src/AddLogDerivative.cpp
@@ -1,14 +1,15 @@
#include "MantidAlgorithms/AddLogDerivative.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/Run.h"
+#include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/MandatoryValidator.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/System.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidKernel/MandatoryValidator.h"
-#include "MantidKernel/BoundedValidator.h"
-#include "MantidAPI/Run.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace Algorithms {
@@ -32,9 +33,10 @@ void AddLogDerivative::init() {
declareProperty("Derivative", 1,
boost::make_shared<BoundedValidator<int>>(1, 10),
"How many derivatives to perform. Default 1.");
- declareProperty("NewLogName", "", "Name of the newly created log. If not "
- "specified, the string '_derivativeN' will "
- "be appended to the original name");
+ declareProperty("NewLogName", "",
+ "Name of the newly created log. If not "
+ "specified, the string '_derivativeN' will "
+ "be appended to the original name");
}
//----------------------------------------------------------------------------------------------
@@ -128,10 +130,11 @@ void AddLogDerivative::exec() {
TimeSeriesProperty<double> *tsp =
dynamic_cast<TimeSeriesProperty<double> *>(prop);
if (!tsp)
- throw std::invalid_argument("Log " + LogName + " is not a numerical series "
- "(TimeSeriesProperty<double>"
- ") so we can't perform its "
- "derivative.");
+ throw std::invalid_argument("Log " + LogName +
+ " is not a numerical series "
+ "(TimeSeriesProperty<double>"
+ ") so we can't perform its "
+ "derivative.");
Progress progress(this, 0.0, 1.0, Derivative);
@@ -144,5 +147,5 @@ void AddLogDerivative::exec() {
g_log.notice() << "Added log named " << NewLogName << '\n';
}
-} // namespace Mantid
} // namespace Algorithms
+} // namespace Mantid
diff --git a/Framework/Algorithms/src/AddNote.cpp b/Framework/Algorithms/src/AddNote.cpp
index e0adb454c35e76d28e4df54d98f2cf3df72a3e18..7e55b73f79f7352853c7bc57dd9aea3c3edc82bb 100644
--- a/Framework/Algorithms/src/AddNote.cpp
+++ b/Framework/Algorithms/src/AddNote.cpp
@@ -36,7 +36,7 @@ void createOrUpdateValue(API::Run &run, const std::string &name,
}
timeSeries->addValue(time, value);
}
-}
+} // namespace
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(AddNote)
@@ -130,7 +130,7 @@ void AddNote::createOrUpdate(API::Run &run, const std::string &name) {
std::string time = getProperty("Time");
if (time.empty()) {
namespace pt = boost::posix_time;
- auto dateTimeObj = DateAndTime(pt::second_clock::local_time());
+ auto dateTimeObj = Types::DateAndTime(pt::second_clock::local_time());
time = dateTimeObj.toISO8601String();
}
std::string value = getProperty("Value");
diff --git a/Framework/Algorithms/src/AddSampleLog.cpp b/Framework/Algorithms/src/AddSampleLog.cpp
index 7abbf956b7f33aed2183fa248bec3a15b7963bee..95af49652dfd35c86e138382e40676f81224837c 100644
--- a/Framework/Algorithms/src/AddSampleLog.cpp
+++ b/Framework/Algorithms/src/AddSampleLog.cpp
@@ -1,14 +1,14 @@
#include "MantidAlgorithms/AddSampleLog.h"
#include "MantidAPI/ExperimentInfo.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/Workspace.h"
-#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/MandatoryValidator.h"
+#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/PropertyWithValue.h"
#include <string>
@@ -21,7 +21,7 @@ static const std::string autoTypeOption = "AutoDetect";
static const std::string stringLogOption = "String";
static const std::string numberLogOption = "Number";
static const std::string numberSeriesLogOption = "Number Series";
-}
+} // namespace
namespace Mantid {
namespace Algorithms {
@@ -77,9 +77,10 @@ void AddSampleLog::init() {
declareProperty("TimeUnit", "Second",
boost::make_shared<Kernel::StringListValidator>(time_units),
"The unit of the time of the input workspace");
- declareProperty("RelativeTime", true, "If specified as True, then then the "
- "time stamps are relative to the run "
- "start time of the target workspace.");
+ declareProperty("RelativeTime", true,
+ "If specified as True, then then the "
+ "time stamps are relative to the run "
+ "start time of the target workspace.");
}
/**
@@ -260,7 +261,7 @@ void AddSampleLog::addTimeSeriesProperty(Run &run_obj,
// create workspace
// get run start
- Kernel::DateAndTime startTime = getRunStart(run_obj);
+ Mantid::Types::DateAndTime startTime = getRunStart(run_obj);
// initialze the TimeSeriesProperty and add unit
if (is_int_series) {
@@ -318,7 +319,7 @@ void AddSampleLog::setTimeSeriesData(Run &run_obj,
bool is_second = timeunit == "Second";
// convert the data in workspace to time series property value
- std::vector<DateAndTime> time_vec =
+ std::vector<Types::DateAndTime> time_vec =
getTimes(data_ws, ws_index, epochtime, is_second, run_obj);
if (value_is_int) {
// integer property
@@ -348,7 +349,7 @@ void AddSampleLog::setTimeSeriesData(Run &run_obj,
* @param run_obj
* @return
*/
-std::vector<Kernel::DateAndTime>
+std::vector<Mantid::Types::DateAndTime>
AddSampleLog::getTimes(API::MatrixWorkspace_const_sptr dataws,
int workspace_index, bool is_epoch, bool is_second,
API::Run &run_obj) {
@@ -356,19 +357,19 @@ AddSampleLog::getTimes(API::MatrixWorkspace_const_sptr dataws,
int64_t timeshift(0);
if (!is_epoch) {
// get the run start time
- Kernel::DateAndTime run_start_time = getRunStart(run_obj);
+ Mantid::Types::DateAndTime run_start_time = getRunStart(run_obj);
timeshift = run_start_time.totalNanoseconds();
}
// set up the time vector
- std::vector<Kernel::DateAndTime> timevec;
+ std::vector<Mantid::Types::DateAndTime> timevec;
size_t vecsize = dataws->readX(workspace_index).size();
for (size_t i = 0; i < vecsize; ++i) {
double timedbl = dataws->readX(workspace_index)[i];
if (is_second)
timedbl *= 1.E9;
int64_t entry_i64 = static_cast<int64_t>(timedbl);
- Kernel::DateAndTime entry(timeshift + entry_i64);
+ Mantid::Types::DateAndTime entry(timeshift + entry_i64);
timevec.push_back(entry);
}
@@ -380,10 +381,10 @@ AddSampleLog::getTimes(API::MatrixWorkspace_const_sptr dataws,
* @param run_obj
* @return
*/
-Kernel::DateAndTime AddSampleLog::getRunStart(API::Run &run_obj) {
+Mantid::Types::DateAndTime AddSampleLog::getRunStart(API::Run &run_obj) {
// TODO/ISSUE/NOW - data ws should be the target workspace with run_start or
// proton_charge property!
- Kernel::DateAndTime runstart(0);
+ Mantid::Types::DateAndTime runstart(0);
try {
runstart = run_obj.startTime();
} catch (std::runtime_error &) {
diff --git a/Framework/Algorithms/src/CalculateCountRate.cpp b/Framework/Algorithms/src/CalculateCountRate.cpp
index 4aee86d8bef1906027c04d7710db7efa4794c817..cfa85736e5f1c60aaee4fbaa2cb1ee6ffbd9dec9 100644
--- a/Framework/Algorithms/src/CalculateCountRate.cpp
+++ b/Framework/Algorithms/src/CalculateCountRate.cpp
@@ -263,12 +263,12 @@ void CalculateCountRate::calcRateLog(
}
// generate target log timing
- std::vector<Kernel::DateAndTime> times(m_numLogSteps);
+ std::vector<Mantid::Types::DateAndTime> times(m_numLogSteps);
double dt = (dTRangeMax - dTRangeMin) / static_cast<double>(m_numLogSteps);
auto t0 = m_TRangeMin.totalNanoseconds();
for (auto i = 0; i < m_numLogSteps; i++) {
times[i] =
- Kernel::DateAndTime(t0 + static_cast<int64_t>((0.5 + double(i)) * dt));
+ Mantid::Types::DateAndTime(t0 + static_cast<int64_t>((0.5 + double(i)) * dt));
}
// store calculated values within the target log.
targLog->replaceValues(times, countRate);
@@ -389,11 +389,11 @@ void CalculateCountRate::setOutLogParameters(
} //---------------------------------------------------------------------
// find target log ranges and identify what normalization should be used
- Kernel::DateAndTime runTMin, runTMax;
+ Mantid::Types::DateAndTime runTMin, runTMax;
InputWorkspace->getPulseTimeMinMax(runTMin, runTMax);
//
if (useLogAccuracy) { // extract log times located inside the run time
- Kernel::DateAndTime tLogMin, tLogMax;
+ Mantid::Types::DateAndTime tLogMin, tLogMax;
if (m_useLogDerivative) { // derivative moves events to the bin centre,
// but we need initial range
auto pSource =
@@ -478,7 +478,7 @@ void CalculateCountRate::setOutLogParameters(
m_numLogSteps++;
iTMax1 = iTMin + provDT * m_numLogSteps;
}
- m_TRangeMax = Kernel::DateAndTime(iTMax1);
+ m_TRangeMax = Mantid::Types::DateAndTime(iTMax1);
}
}
diff --git a/Framework/Algorithms/src/ChangeLogTime.cpp b/Framework/Algorithms/src/ChangeLogTime.cpp
index 90b23376958a964ceb9083f3db6337294c928e57..f38b731ac34bd654a8596a56f35a85a65c15fdc9 100644
--- a/Framework/Algorithms/src/ChangeLogTime.cpp
+++ b/Framework/Algorithms/src/ChangeLogTime.cpp
@@ -1,9 +1,11 @@
#include "MantidAlgorithms/ChangeLogTime.h"
-#include "MantidDataObjects/EventWorkspace.h"
#include "MantidAPI/Run.h"
+#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <sstream>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Algorithms {
@@ -92,5 +94,5 @@ void ChangeLogTime::exec() {
outputWS->mutableRun().addProperty(newlog, true);
}
-} // namespace Mantid
} // namespace Algorithms
+} // namespace Mantid
diff --git a/Framework/Algorithms/src/ChangeTimeZero.cpp b/Framework/Algorithms/src/ChangeTimeZero.cpp
index 5494590af12673237310f09444f63aac815b0dfc..74e8cea8e54617d281db5eadad05bc277cb038c3 100644
--- a/Framework/Algorithms/src/ChangeTimeZero.cpp
+++ b/Framework/Algorithms/src/ChangeTimeZero.cpp
@@ -1,20 +1,22 @@
#include "MantidAlgorithms/ChangeTimeZero.h"
-#include "MantidAlgorithms/CloneWorkspace.h"
-#include "MantidAlgorithms/ChangePulsetime.h"
-#include "MantidAPI/IMDIterator.h"
#include "MantidAPI/IEventWorkspace.h"
+#include "MantidAPI/IMDIterator.h"
#include "MantidAPI/Run.h"
+#include "MantidAlgorithms/ChangePulsetime.h"
+#include "MantidAlgorithms/CloneWorkspace.h"
#include "MantidDataObjects/EventList.h"
-#include "MantidKernel/System.h"
-#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/DateTimeValidator.h"
+#include "MantidKernel/PropertyWithValue.h"
+#include "MantidKernel/System.h"
+#include "MantidKernel/TimeSeriesProperty.h"
#include <boost/lexical_cast.hpp>
#include <boost/shared_ptr.hpp>
+using namespace Mantid::Types;
+
namespace Mantid {
namespace Algorithms {
@@ -38,7 +40,7 @@ bool isTimeSeries(Mantid::Kernel::Property *prop) {
}
return isTimeSeries;
}
-}
+} // namespace
/** Initialize the algorithm's properties.
*/
@@ -133,8 +135,8 @@ double ChangeTimeZero::getTimeShift(API::MatrixWorkspace_sptr ws) const {
// Check if we are dealing with an absolute time
std::string timeOffset = getProperty("AbsoluteTimeOffset");
if (isAbsoluteTimeShift(timeOffset)) {
- DateAndTime desiredTime(timeOffset);
- DateAndTime originalTime(getStartTimeFromWorkspace(ws));
+ DateAndTime desiredTime = DateAndTimeHelpers::createFromISO8601(timeOffset);
+ DateAndTime originalTime = getStartTimeFromWorkspace(ws);
timeShift = DateAndTime::secondsFromDuration(desiredTime - originalTime);
} else {
timeShift = getProperty("RelativeTimeOffset");
@@ -196,7 +198,7 @@ void ChangeTimeZero::shiftTimeOfLogForStringProperty(
// Parse the log entry and replace all ISO8601 strings with an adjusted value
auto value = logEntry->value();
if (checkForDateTime(value)) {
- DateAndTime dateTime(value);
+ DateAndTime dateTime = DateAndTimeHelpers::createFromISO8601(value);
DateAndTime shiftedTime = dateTime + timeShift;
logEntry->setValue(shiftedTime.toISO8601String());
}
@@ -356,5 +358,5 @@ bool ChangeTimeZero::isAbsoluteTimeShift(const std::string &offset) const {
return offset != m_defaultAbsoluteTimeShift && checkForDateTime(offset);
}
-} // namespace Mantid
} // namespace Algorithms
+} // namespace Mantid
diff --git a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
index 25b1e157925aa7a3dcd293ac05dc1b798d65d2aa..3686074ff9cace03f58d655d3fae228557de35e7 100644
--- a/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
+++ b/Framework/Algorithms/src/CorelliCrossCorrelate.cpp
@@ -16,6 +16,8 @@
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/src/CreateSampleWorkspace.cpp b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
index a6c42e95b033eeda52f1aa51559e196e2859e071..cf5ca498cd522d62a786de5f543a6e3301b274dc 100644
--- a/Framework/Algorithms/src/CreateSampleWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
@@ -1,23 +1,24 @@
-#include "MantidHistogramData/LinearGenerator.h"
#include "MantidAlgorithms/CreateSampleWorkspace.h"
#include "MantidAPI/Axis.h"
-#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FunctionDomain1D.h"
+#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FunctionProperty.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/ScanningWorkspaceBuilder.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/WorkspaceCreation.h"
-#include "MantidGeometry/Objects/ShapeFactory.h"
-#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
+#include "MantidGeometry/Instrument/ReferenceFrame.h"
+#include "MantidGeometry/Objects/ShapeFactory.h"
+#include "MantidHistogramData/LinearGenerator.h"
+#include "MantidIndexing/IndexInfo.h"
#include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/ListValidator.h"
-#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/MersenneTwister.h"
-#include "MantidIndexing/IndexInfo.h"
+#include "MantidKernel/UnitFactory.h"
#include "MantidTypes/SpectrumDefinition.h"
#include <cmath>
@@ -25,6 +26,8 @@
#include <numeric>
#include <stdexcept>
+using namespace Mantid::Types;
+
namespace Mantid {
namespace Algorithms {
using namespace Kernel;
@@ -199,7 +202,8 @@ void CreateSampleWorkspace::exec() {
// down
binWidth = xMax - xMin;
g_log.warning() << "The bin width is so large that there is less than one "
- "bin - it has been changed to " << binWidth << '\n';
+ "bin - it has been changed to "
+ << binWidth << '\n';
}
std::string functionString;
@@ -258,8 +262,8 @@ void CreateSampleWorkspace::exec() {
ws->setYUnit("Counts");
ws->setTitle("Test Workspace");
- DateAndTime run_start("2010-01-01T00:00:00");
- DateAndTime run_end("2010-01-01T01:00:00");
+ auto run_start = DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
+ auto run_end = DateAndTimeHelpers::createFromISO8601("2010-01-01T01:00:00");
Run &theRun = ws->mutableRun();
// belt and braces use both approaches for setting start and end times
theRun.setStartAndEndTime(run_start, run_end);
@@ -337,7 +341,7 @@ MatrixWorkspace_sptr CreateSampleWorkspace::createScanningWorkspace(
timeRanges.push_back(double(i + 1));
}
- builder.setTimeRanges(Kernel::DateAndTime(0), timeRanges);
+ builder.setTimeRanges(Mantid::Types::DateAndTime(0), timeRanges);
builder.setRelativeRotationsForScans(angles, inst->getSample()->getPos(),
V3D(0, 1, 0));
@@ -357,7 +361,7 @@ EventWorkspace_sptr CreateSampleWorkspace::createEventWorkspace(
int numPixels, int numBins, int numMonitors, int numEvents, double x0,
double binDelta, Geometry::Instrument_sptr inst,
const std::string &functionString, bool isRandom) {
- DateAndTime run_start("2010-01-01T00:00:00");
+ auto run_start = DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
std::vector<SpectrumDefinition> specDefs(numPixels + numMonitors);
for (int wi = 0; wi < numMonitors + numPixels; wi++)
@@ -557,8 +561,9 @@ Instrument_sptr CreateSampleWorkspace::createTestInstrumentRectangular(
testInst->add(bank);
// Set the bank along the z-axis of the instrument, between the detectors.
- bank->setPos(V3D(0.0, 0.0, bankDistanceFromSample *
- (monitorNumber - monitorsStart + 0.5)));
+ bank->setPos(
+ V3D(0.0, 0.0,
+ bankDistanceFromSample * (monitorNumber - monitorsStart + 0.5)));
}
// Define a source component
diff --git a/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp b/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
index 24381be1b96d7f0ff0d4f7065ef00ae70228f5ad..bc75e0591291c340f3a4b24f2ead3e5f695096b7 100644
--- a/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
+++ b/Framework/Algorithms/src/DiffractionEventCalibrateDetectors.cpp
@@ -1,5 +1,4 @@
#include "MantidAlgorithms/DiffractionEventCalibrateDetectors.h"
-#include "MantidAlgorithms/GSLFunctions.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/IFunction.h"
@@ -7,6 +6,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/TextAxis.h"
+#include "MantidAlgorithms/GSLFunctions.h"
#include "MantidDataObjects/EventList.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/GroupingWorkspace.h"
@@ -14,15 +14,15 @@
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/CPUTimer.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
-#include "MantidKernel/BoundedValidator.h"
#include <Poco/File.h>
#include <cmath>
-#include <numeric>
#include <fstream>
+#include <numeric>
#include <sstream>
namespace Mantid {
@@ -236,7 +236,7 @@ double DiffractionEventCalibrateDetectors::intensity(
}
/** Initialisation method
-*/
+ */
void DiffractionEventCalibrateDetectors::init() {
declareProperty(make_unique<WorkspaceProperty<EventWorkspace>>(
"InputWorkspace", "", Direction::Input,
@@ -275,9 +275,9 @@ void DiffractionEventCalibrateDetectors::init() {
}
/** Executes the algorithm
-*
-* @throw runtime_error Thrown if algorithm cannot execute
-*/
+ *
+ * @throw runtime_error Thrown if algorithm cannot execute
+ */
void DiffractionEventCalibrateDetectors::exec() {
// Try to retrieve optional properties
const int maxIterations = getProperty("MaxIterations");
@@ -375,7 +375,9 @@ void DiffractionEventCalibrateDetectors::exec() {
outfile << "# Base and up give directions of unit vectors for a local\n";
outfile << "# x,y coordinate system on the face of the detector.\n";
outfile << "#\n";
- outfile << "# " << DateAndTime::getCurrentTime().toFormattedString("%c")
+ outfile << "# "
+ << Mantid::Types::DateAndTime::getCurrentTime().toFormattedString(
+ "%c")
<< "\n";
outfile << "#\n";
outfile << "6 L1 T0_SHIFT\n";
@@ -584,5 +586,5 @@ void DiffractionEventCalibrateDetectors::exec() {
outfile.close();
}
-} // namespace Algorithm
+} // namespace Algorithms
} // namespace Mantid
diff --git a/Framework/Algorithms/src/ExportTimeSeriesLog.cpp b/Framework/Algorithms/src/ExportTimeSeriesLog.cpp
index 35c15bc9fa4cbb290bda06618c27f87ce484d0df..ae8489b05eaa387bd289ada4c1c26a898ec01459 100644
--- a/Framework/Algorithms/src/ExportTimeSeriesLog.cpp
+++ b/Framework/Algorithms/src/ExportTimeSeriesLog.cpp
@@ -10,6 +10,7 @@
#include "MantidDataObjects/Events.h"
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/System.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -25,6 +26,8 @@ using namespace Mantid::DataObjects;
using namespace std;
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Algorithms {
@@ -73,9 +76,10 @@ void ExportTimeSeriesLog::init() {
"NumberEntriesExport", EMPTY_INT(),
"Number of entries of the log to be exported. Default is all entries.");
- declareProperty("IsEventWorkspace", true, "If set to true, output workspace "
- "is EventWorkspace. Otherwise, it "
- "is Workspace2D.");
+ declareProperty("IsEventWorkspace", true,
+ "If set to true, output workspace "
+ "is EventWorkspace. Otherwise, it "
+ "is Workspace2D.");
}
/** Main execution
@@ -129,7 +133,7 @@ void ExportTimeSeriesLog::exportLog(const std::string &logname,
int numentries, bool cal_first_deriv) {
// Get log, time, and etc.
- std::vector<Kernel::DateAndTime> times;
+ std::vector<Mantid::Types::DateAndTime> times;
std::vector<double> values;
if (!logname.empty()) {
@@ -187,7 +191,8 @@ void ExportTimeSeriesLog::exportLog(const std::string &logname,
} else if (numentries <= 0) {
stringstream errmsg;
errmsg << "For Export Log, NumberEntriesExport must be greater than 0. "
- "Input = " << numentries;
+ "Input = "
+ << numentries;
g_log.error(errmsg.str());
throw std::runtime_error(errmsg.str());
} else if (static_cast<size_t>(numentries) > times.size()) {
@@ -212,7 +217,7 @@ void ExportTimeSeriesLog::exportLog(const std::string &logname,
* @param start_index :: array index for the first log entry
* @param stop_index :: array index for the last log entry
* @param numentries :: number of log entries to output
- * @param times :: vector of Kernel::DateAndTime
+ * @param times :: vector of Mantid::Types::DateAndTime
* @param values :: vector of log value in double
* @param epochtime :: flag to output time in epoch time/absolute time
* @param timeunitfactor :: conversion factor for various unit of time for
@@ -227,7 +232,7 @@ void ExportTimeSeriesLog::setupWorkspace2D(
int64_t timeshift(0);
if (!epochtime) {
// relative time
- Kernel::DateAndTime runstart(
+ auto runstart = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
m_inputWS->run().getProperty("run_start")->value());
timeshift = runstart.totalNanoseconds();
}
@@ -275,14 +280,14 @@ void ExportTimeSeriesLog::setupWorkspace2D(
* @param start_index
* @param stop_index
* @param numentries :: number of log entries to output
- * @param times :: vector of Kernel::DateAndTime
+ * @param times :: vector of Mantid::Types::DateAndTime
* @param values :: vector of log value in double
* @param epochtime :: boolean flag for output time is absolute time/epoch time.
*/
void ExportTimeSeriesLog::setupEventWorkspace(
const size_t &start_index, const size_t &stop_index, int numentries,
vector<DateAndTime> ×, vector<double> values, const bool &epochtime) {
- Kernel::DateAndTime runstart(
+ auto runstart = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
m_inputWS->run().getProperty("run_start")->value());
// Get some stuff from the input workspace
@@ -311,7 +316,7 @@ void ExportTimeSeriesLog::setupEventWorkspace(
}
for (size_t i = 0; i < outsize; i++) {
- Kernel::DateAndTime tnow = times[i + start_index];
+ Mantid::Types::DateAndTime tnow = times[i + start_index];
int64_t dt = tnow.totalNanoseconds() - time_shift_ns;
// convert to microseconds
@@ -339,15 +344,15 @@ void ExportTimeSeriesLog::setupEventWorkspace(
* second is 1E-9
*/
bool ExportTimeSeriesLog::calculateTimeSeriesRangeByTime(
- std::vector<Kernel::DateAndTime> &vec_times, const double &rel_start_time,
- size_t &i_start, const double &rel_stop_time, size_t &i_stop,
- const double &time_factor) {
+ std::vector<Mantid::Types::DateAndTime> &vec_times,
+ const double &rel_start_time, size_t &i_start, const double &rel_stop_time,
+ size_t &i_stop, const double &time_factor) {
// Initialize if there is something wrong.
i_start = 0;
i_stop = vec_times.size() - 1;
// Check existence of proton_charge as run start
- Kernel::DateAndTime run_start(0);
+ Mantid::Types::DateAndTime run_start(0);
if (m_inputWS->run().hasProperty("proton_charge")) {
auto ts = dynamic_cast<TimeSeriesProperty<double> *>(
m_inputWS->run().getProperty("proton_charge"));
@@ -369,7 +374,7 @@ bool ExportTimeSeriesLog::calculateTimeSeriesRangeByTime(
if (rel_start_time != EMPTY_DBL()) {
int64_t start_time_ns = run_start.totalNanoseconds() +
static_cast<int64_t>(rel_start_time / time_factor);
- Kernel::DateAndTime start_time(start_time_ns);
+ Mantid::Types::DateAndTime start_time(start_time_ns);
i_start = static_cast<size_t>(
std::lower_bound(vec_times.begin(), vec_times.end(), start_time) -
vec_times.begin());
@@ -382,7 +387,7 @@ bool ExportTimeSeriesLog::calculateTimeSeriesRangeByTime(
if (rel_stop_time != EMPTY_DBL()) {
int64_t stop_time_ns = run_start.totalNanoseconds() +
static_cast<int64_t>(rel_stop_time / time_factor);
- Kernel::DateAndTime stop_time(stop_time_ns);
+ Mantid::Types::DateAndTime stop_time(stop_time_ns);
i_stop = static_cast<size_t>(
std::lower_bound(vec_times.begin(), vec_times.end(), stop_time) -
vec_times.begin());
@@ -456,5 +461,5 @@ void ExportTimeSeriesLog::setupMetaData(const std::string &log_name,
m_outWS->mutableRun().addProperty("IsEpochTime", is_epoch, true);
}
-} // namespace Mantid
} // namespace Algorithms
+} // namespace Mantid
diff --git a/Framework/Algorithms/src/FilterByLogValue.cpp b/Framework/Algorithms/src/FilterByLogValue.cpp
index e1901303c6cb107487454d9166af5917a72aa752..393137da607d00b973f129c8d8cef3ac06a51873 100644
--- a/Framework/Algorithms/src/FilterByLogValue.cpp
+++ b/Framework/Algorithms/src/FilterByLogValue.cpp
@@ -1,10 +1,12 @@
#include "MantidAlgorithms/FilterByLogValue.h"
-#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidAPI/Run.h"
+#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/ITimeSeriesProperty.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/MandatoryValidator.h"
+#include "MantidKernel/TimeInterval.h"
namespace Mantid {
namespace Algorithms {
@@ -16,8 +18,9 @@ using namespace DataObjects;
using namespace API;
using DataObjects::EventList;
using DataObjects::EventWorkspace;
-using DataObjects::EventWorkspace_sptr;
using DataObjects::EventWorkspace_const_sptr;
+using DataObjects::EventWorkspace_sptr;
+using Mantid::Types::DateAndTime;
std::string CENTRE("Centre");
std::string LEFT("Left");
@@ -122,7 +125,9 @@ void FilterByLogValue::exec() {
// Find the start and stop times of the run, but handle it if they are not
// found.
- DateAndTime run_start(0), run_stop("2100-01-01T00:00:00");
+ DateAndTime run_start(0),
+ run_stop = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2100-01-01T00:00:00");
bool handle_edge_values = false;
try {
run_start = inputWS->getFirstPulseTime() - tolerance;
diff --git a/Framework/Algorithms/src/FilterByTime.cpp b/Framework/Algorithms/src/FilterByTime.cpp
index fe151e505ff1fcfcacbe1372c99766a0c8938212..97d849865bddbc67836a37a395ed74139453e2da 100644
--- a/Framework/Algorithms/src/FilterByTime.cpp
+++ b/Framework/Algorithms/src/FilterByTime.cpp
@@ -3,10 +3,12 @@
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidKernel/BoundedValidator.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/PhysicalConstants.h"
#include "MantidKernel/UnitFactory.h"
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Algorithms {
// Register the algorithm into the algorithm factory
@@ -16,8 +18,8 @@ using namespace Kernel;
using namespace API;
using DataObjects::EventList;
using DataObjects::EventWorkspace;
-using DataObjects::EventWorkspace_sptr;
using DataObjects::EventWorkspace_const_sptr;
+using DataObjects::EventWorkspace_sptr;
void FilterByTime::init() {
std::string commonHelp("\nYou can only specify the relative or absolute "
@@ -77,12 +79,12 @@ void FilterByTime::exec() {
start_str = getPropertyValue("AbsoluteStartTime");
stop_str = getPropertyValue("AbsoluteStopTime");
- if ((!start_str.empty()) && (!stop_str.empty()) && (start_dbl <= 0.0) &&
+ if ((start_str != "") && (stop_str != "") && (start_dbl <= 0.0) &&
(stop_dbl <= 0.0)) {
// Use the absolute string
- start = DateAndTime(start_str);
- stop = DateAndTime(stop_str);
- } else if ((start_str.empty()) && (stop_str.empty()) &&
+ start = Mantid::Types::DateAndTimeHelpers::createFromISO8601(start_str);
+ stop = Mantid::Types::DateAndTimeHelpers::createFromISO8601(stop_str);
+ } else if ((start_str == "") && (stop_str == "") &&
((start_dbl > 0.0) || (stop_dbl > 0.0))) {
// Use the relative times in seconds.
DateAndTime first = inputWS->getFirstPulseTime();
diff --git a/Framework/Algorithms/src/FilterEvents.cpp b/Framework/Algorithms/src/FilterEvents.cpp
index 763249165061306139a999193b34d24b1aa7756d..69aa59285caee7ce12b63f797dca09bb2265896e 100644
--- a/Framework/Algorithms/src/FilterEvents.cpp
+++ b/Framework/Algorithms/src/FilterEvents.cpp
@@ -14,8 +14,8 @@
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/LogFilter.h"
#include "MantidKernel/PhysicalConstants.h"
@@ -32,6 +32,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
+using namespace Mantid::Types;
using namespace std;
@@ -92,9 +93,10 @@ void FilterEvents::init() {
"environment log. This option can make execution of "
"algorithm faster. But it lowers precision.");
- declareProperty("GroupWorkspaces", false, "Option to group all the output "
- "workspaces. Group name will be "
- "OutputWorkspaceBaseName.");
+ declareProperty("GroupWorkspaces", false,
+ "Option to group all the output "
+ "workspaces. Group name will be "
+ "OutputWorkspaceBaseName.");
declareProperty("OutputWorkspaceIndexedFrom1", false,
"If selected, the minimum output workspace is indexed from 1 "
@@ -395,7 +397,8 @@ void FilterEvents::processAlgorithmProperties() {
if (m_toGroupWS && m_outputWSNameBase.compare(m_eventWS->getName()) == 0) {
std::stringstream errss;
errss << "It is not allowed to group output workspaces into the same name "
- "(i..e, OutputWorkspaceBaseName = " << m_outputWSNameBase
+ "(i..e, OutputWorkspaceBaseName = "
+ << m_outputWSNameBase
<< ") as the input workspace to filter events from.";
throw std::invalid_argument(errss.str());
}
@@ -448,7 +451,7 @@ void FilterEvents::processAlgorithmProperties() {
// Get run start time from property 'run_start'
if (m_eventWS->run().hasProperty("run_start")) {
- Kernel::DateAndTime run_start_time(
+ DateAndTime run_start_time = DateAndTimeHelpers::createFromISO8601(
m_eventWS->run().getProperty("run_start")->value());
m_runStartTime = run_start_time;
}
@@ -460,7 +463,8 @@ void FilterEvents::processAlgorithmProperties() {
std::string start_time_str = getProperty("FilterStartTime");
if (!start_time_str.empty()) {
// User specifies the filter starting time
- Kernel::DateAndTime temp_shift_time(start_time_str);
+ DateAndTime temp_shift_time =
+ DateAndTimeHelpers::createFromISO8601(start_time_str);
m_filterStartTime = temp_shift_time;
} else {
// Retrieve filter starting time from property run_start as default
@@ -628,7 +632,7 @@ void FilterEvents::splitTimeSeriesLogs(
const std::vector<TimeSeriesProperty<double> *> &dbl_tsp_vector,
const std::vector<TimeSeriesProperty<bool> *> &bool_tsp_vector) {
// get split times by converting vector of int64 to Time
- std::vector<Kernel::DateAndTime> split_datetime_vec;
+ std::vector<Mantid::Types::DateAndTime> split_datetime_vec;
// convert splitters workspace to vectors used by TableWorkspace and
// MatrixWorkspace splitters
@@ -696,7 +700,7 @@ void FilterEvents::splitTimeSeriesLogs(
template <typename TYPE>
void FilterEvents::splitTimeSeriesProperty(
Kernel::TimeSeriesProperty<TYPE> *tsp,
- std::vector<Kernel::DateAndTime> &split_datetime_vec,
+ std::vector<Mantid::Types::DateAndTime> &split_datetime_vec,
const int max_target_index) {
// skip the sample logs if they are specified
// get property name and etc
@@ -1239,9 +1243,8 @@ void FilterEvents::createOutputWorkspacesMatrixCase() {
}
// Update progress report
- m_progress =
- 0.1 +
- 0.1 * static_cast<double>(wsgindex) / static_cast<double>(numoutputws);
+ m_progress = 0.1 + 0.1 * static_cast<double>(wsgindex) /
+ static_cast<double>(numoutputws);
progress(m_progress, "Creating output workspace");
wsgindex += 1;
} // END-FOR (wsgroup)
@@ -1329,9 +1332,8 @@ void FilterEvents::createOutputWorkspacesTableSplitterCase() {
}
// Update progress report
- m_progress =
- 0.1 +
- 0.1 * static_cast<double>(wsgindex) / static_cast<double>(numoutputws);
+ m_progress = 0.1 + 0.1 * static_cast<double>(wsgindex) /
+ static_cast<double>(numoutputws);
progress(m_progress, "Creating output workspace");
wsgindex += 1;
} // END-FOR (wsgroup)
@@ -1344,11 +1346,11 @@ void FilterEvents::createOutputWorkspacesTableSplitterCase() {
}
/** Set up neutron event's TOF correction.
- * It can be (1) parsed from TOF-correction table workspace to vectors,
- * (2) created according to detector's position in instrument;
- * (3) or no correction,i.e., correction value is equal to 1.
- * Offset should be as F*TOF + B
- */
+ * It can be (1) parsed from TOF-correction table workspace to vectors,
+ * (2) created according to detector's position in instrument;
+ * (3) or no correction,i.e., correction value is equal to 1.
+ * Offset should be as F*TOF + B
+ */
void FilterEvents::setupDetectorTOFCalibration() {
// Set output correction workspace and set to output
const size_t numhist = m_eventWS->getNumberHistograms();
@@ -1419,12 +1421,12 @@ TimeAtSampleStrategy *FilterEvents::setupIndirectTOFCorrection() const {
}
/** Set up corrections with customized TOF correction input
- * The first column must be either DetectorID or Spectrum (from 0... as
+ * The first column must be either DetectorID or Spectrum (from 0... as
* workspace index)
- * The second column must be Correction or CorrectFactor, a number between 0
+ * The second column must be Correction or CorrectFactor, a number between 0
* and 1, i.e, [0, 1]
- * The third column is optional as shift in unit of second
- */
+ * The third column is optional as shift in unit of second
+ */
void FilterEvents::setupCustomizedTOFCorrection() {
// Check input workspace
vector<string> colnames = m_detCorrectWorkspace->getColumnNames();
@@ -1567,7 +1569,7 @@ void FilterEvents::setupCustomizedTOFCorrection() {
}
/** Main filtering method
- * Structure: per spectrum --> per workspace
+ * Structure: per spectrum --> per workspace
*/
void FilterEvents::filterEventsBySplitters(double progressamount) {
size_t numberOfSpectra = m_eventWS->getNumberHistograms();
@@ -1619,7 +1621,7 @@ void FilterEvents::filterEventsBySplitters(double progressamount) {
}
/** Split events by splitters represented by vector
- */
+ */
void FilterEvents::filterEventsByVectorSplitters(double progressamount) {
size_t numberOfSpectra = m_eventWS->getNumberHistograms();
// FIXME : consider to use vector to index workspace and event list
@@ -1627,8 +1629,8 @@ void FilterEvents::filterEventsByVectorSplitters(double progressamount) {
// Loop over the histograms (detector spectra) to do split from 1 event list
// to N event list
g_log.notice() << "Filter by vector splitters: Number of spectra in "
- "input/source EventWorkspace = " << numberOfSpectra
- << ".\n";
+ "input/source EventWorkspace = "
+ << numberOfSpectra << ".\n";
// check for option FilterByTime
if (m_filterByPulseTime) {
@@ -1639,9 +1641,11 @@ void FilterEvents::filterEventsByVectorSplitters(double progressamount) {
std::stringstream errmsg;
errmsg << "It is not proper to split fast event 'By PulseTime'', when "
"there are "
- "more splitters (" << m_vecSplitterTime.size()
+ "more splitters ("
+ << m_vecSplitterTime.size()
<< ") than pulse time "
- "log entries (" << num_proton_charges << ")";
+ "log entries ("
+ << num_proton_charges << ")";
throw runtime_error(errmsg.str());
} else
g_log.warning("User should understand the inaccurancy to filter events "
@@ -1732,7 +1736,7 @@ void FilterEvents::generateSplitterTSP(
new Kernel::TimeSeriesProperty<int>("splitter");
split_tsp_vec.push_back(split_tsp);
// add initial value if the first splitter time is after the run start time
- split_tsp->addValue(Kernel::DateAndTime(m_runStartTime), 0);
+ split_tsp->addValue(Mantid::Types::DateAndTime(m_runStartTime), 0);
}
// start to go through m_vecSplitterTime (int64) and m_vecSplitterGroup add
@@ -1901,5 +1905,5 @@ std::vector<std::string> FilterEvents::getTimeSeriesLogNames() {
return lognames;
}
-} // namespace Mantid
} // namespace Algorithms
+} // namespace Mantid
diff --git a/Framework/Algorithms/src/GenerateEventsFilter.cpp b/Framework/Algorithms/src/GenerateEventsFilter.cpp
index 806801bedc03b66eb10a2379eef13525bb51eb19..484cee1f70ec28fe30a3a8c07386da62ac95d63a 100644
--- a/Framework/Algorithms/src/GenerateEventsFilter.cpp
+++ b/Framework/Algorithms/src/GenerateEventsFilter.cpp
@@ -6,6 +6,7 @@
#include "MantidAPI/WorkspaceProperty.h"
#include "MantidKernel/VisibleWhenProperty.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <boost/math/special_functions/round.hpp>
@@ -14,6 +15,8 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace std;
+using Mantid::Types::DateAndTime;
+using Mantid::Types::time_duration;
namespace Mantid {
namespace Algorithms {
@@ -309,7 +312,7 @@ void GenerateEventsFilter::processInputTime() {
m_startTime = runstarttime;
} else if (instringformat) {
// Time is absolute time in ISO format
- m_startTime = DateAndTime(s_inpt0);
+ m_startTime = Mantid::Types::DateAndTimeHelpers::createFromISO8601(s_inpt0);
} else {
// Relative time in double.
double inpt0 = std::stod(s_inpt0.c_str());
@@ -320,7 +323,7 @@ void GenerateEventsFilter::processInputTime() {
}
int64_t t0_ns = runstarttime.totalNanoseconds() +
static_cast<int64_t>(inpt0 * m_timeUnitConvertFactorToNS);
- m_startTime = Kernel::DateAndTime(t0_ns);
+ m_startTime = Mantid::Types::DateAndTime(t0_ns);
}
// Set up run stop time
@@ -329,13 +332,13 @@ void GenerateEventsFilter::processInputTime() {
m_stopTime = m_runEndTime;
} else if (instringformat) {
// Absolute time in ISO format
- m_stopTime = DateAndTime(s_inptf);
+ m_stopTime = Mantid::Types::DateAndTimeHelpers::createFromISO8601(s_inptf);
} else {
// Relative time in double
double inptf = std::stod(s_inptf.c_str());
int64_t tf_ns = runstarttime.totalNanoseconds() +
static_cast<int64_t>(inptf * m_timeUnitConvertFactorToNS);
- m_stopTime = Kernel::DateAndTime(tf_ns);
+ m_stopTime = Mantid::Types::DateAndTime(tf_ns);
}
// Check start/stop time
@@ -405,8 +408,8 @@ void GenerateEventsFilter::setFilterByTimeOnly() {
nexttime_ns = m_stopTime.totalNanoseconds();
// Create splitter and information
- Kernel::DateAndTime t0(curtime_ns);
- Kernel::DateAndTime tf(nexttime_ns);
+ Mantid::Types::DateAndTime t0(curtime_ns);
+ Mantid::Types::DateAndTime tf(nexttime_ns);
std::stringstream ss;
ss << "Time.Interval.From." << t0 << ".to." << tf;
@@ -458,8 +461,8 @@ void GenerateEventsFilter::setFilterByTimeOnly() {
}
// Create splitter and information
- Kernel::DateAndTime t0(curtime_ns);
- Kernel::DateAndTime tf(nexttime_ns);
+ Mantid::Types::DateAndTime t0(curtime_ns);
+ Mantid::Types::DateAndTime tf(nexttime_ns);
std::stringstream ss;
ss << "Time.Interval.From." << t0 << ".to." << tf;
@@ -809,7 +812,7 @@ void GenerateEventsFilter::processMultipleValueFilters(double minvalue,
void GenerateEventsFilter::makeFilterBySingleValue(
double min, double max, double TimeTolerance, bool centre,
bool filterIncrease, bool filterDecrease, DateAndTime startTime,
- Kernel::DateAndTime stopTime, int wsindex) {
+ Mantid::Types::DateAndTime stopTime, int wsindex) {
// Do nothing if the log is empty.
if (m_dblLog->size() == 0) {
g_log.warning() << "There is no entry in this property " << this->name()
@@ -902,9 +905,9 @@ void GenerateEventsFilter::makeFilterBySingleValue(
* with the old direction)
*/
bool GenerateEventsFilter::identifyLogEntry(
- const int &index, const Kernel::DateAndTime &currT, const bool &lastgood,
+ const int &index, const Mantid::Types::DateAndTime &currT, const bool &lastgood,
const double &minvalue, const double &maxvalue,
- const Kernel::DateAndTime &startT, const Kernel::DateAndTime &stopT,
+ const Mantid::Types::DateAndTime &startT, const Mantid::Types::DateAndTime &stopT,
const bool &filterIncrease, const bool &filterDecrease) {
double val = m_dblLog->nthValue(index);
@@ -1167,7 +1170,7 @@ void GenerateEventsFilter::makeMultipleFiltersByValuesParallel(
/** Make filters by multiple log values of partial log
*/
void GenerateEventsFilter::makeMultipleFiltersByValuesPartialLog(
- int istart, int iend, std::vector<Kernel::DateAndTime> &vecSplitTime,
+ int istart, int iend, std::vector<Mantid::Types::DateAndTime> &vecSplitTime,
std::vector<int> &vecSplitGroup, map<size_t, int> indexwsindexmap,
const vector<double> &logvalueranges, time_duration tol,
bool filterIncrease, bool filterDecrease, DateAndTime startTime,
@@ -1181,7 +1184,7 @@ void GenerateEventsFilter::makeMultipleFiltersByValuesPartialLog(
int64_t tol_ns = tol.total_nanoseconds();
// Define loop control parameters
- const Kernel::DateAndTime ZeroTime(0);
+ const Mantid::Types::DateAndTime ZeroTime(0);
int lastindex = -1;
int currindex = -1;
DateAndTime lastTime;
@@ -1652,7 +1655,7 @@ int GenerateEventsFilter::determineChangingDirection(int startindex) {
/** Add a new splitter to vector of splitters. It is used by FilterByTime only.
*/
void GenerateEventsFilter::addNewTimeFilterSplitter(
- Kernel::DateAndTime starttime, Kernel::DateAndTime stoptime, int wsindex,
+ Mantid::Types::DateAndTime starttime, Mantid::Types::DateAndTime stoptime, int wsindex,
string info) {
if (m_forFastLog) {
// For MatrixWorkspace splitter
@@ -1694,9 +1697,9 @@ void GenerateEventsFilter::addNewTimeFilterSplitter(
* This method will be called intensively.
*/
DateAndTime GenerateEventsFilter::makeSplitterInVector(
- std::vector<Kernel::DateAndTime> &vecSplitTime,
- std::vector<int> &vecGroupIndex, Kernel::DateAndTime start,
- Kernel::DateAndTime stop, int group, int64_t tol_ns, DateAndTime lasttime) {
+ std::vector<Mantid::Types::DateAndTime> &vecSplitTime,
+ std::vector<int> &vecGroupIndex, Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop, int group, int64_t tol_ns, DateAndTime lasttime) {
DateAndTime starttime(start.totalNanoseconds() - tol_ns);
DateAndTime stoptime(stop.totalNanoseconds() - tol_ns);
// DateAndTime starttime = start-tolerance;
@@ -1857,7 +1860,7 @@ DateAndTime GenerateEventsFilter::findRunEnd() {
}
if (protonchargelog->size() > 1) {
- Kernel::DateAndTime tmpendtime = protonchargelog->lastTime();
+ Mantid::Types::DateAndTime tmpendtime = protonchargelog->lastTime();
extended_ns = protonchargelog->nthTime(1).totalNanoseconds() -
protonchargelog->nthTime(0).totalNanoseconds();
if (tmpendtime > runendtime) {
diff --git a/Framework/Algorithms/src/GenerateIPythonNotebook.cpp b/Framework/Algorithms/src/GenerateIPythonNotebook.cpp
index e5e90cd9a25919dd1ca18464b53e17adb9231662..65fa592b27de9a4b9d6cc72819454d7ffcbb76a8 100644
--- a/Framework/Algorithms/src/GenerateIPythonNotebook.cpp
+++ b/Framework/Algorithms/src/GenerateIPythonNotebook.cpp
@@ -1,16 +1,18 @@
#include "MantidAlgorithms/GenerateIPythonNotebook.h"
-#include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
-#include "MantidAPI/FileProperty.h"
-#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AlgorithmHistory.h"
+#include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/FileProperty.h"
#include "MantidAPI/NotebookBuilder.h"
#include "MantidAPI/Workspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/System.h"
#include <fstream>
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using namespace Mantid::Types;
namespace {
Mantid::Kernel::Logger g_log("GenerateIPythonNotebook");
@@ -23,7 +25,7 @@ namespace Algorithms {
DECLARE_ALGORITHM(GenerateIPythonNotebook)
/** Initialize the algorithm's properties.
-*/
+ */
void GenerateIPythonNotebook::init() {
declareProperty(make_unique<WorkspaceProperty<Workspace>>(
"InputWorkspace", "", Direction::Input),
@@ -60,7 +62,7 @@ void GenerateIPythonNotebook::init() {
}
/** Execute the algorithm.
-*/
+ */
void GenerateIPythonNotebook::exec() {
const Workspace_const_sptr ws = getProperty("InputWorkspace");
const bool unrollAll = getProperty("UnrollAll");
@@ -83,9 +85,12 @@ void GenerateIPythonNotebook::exec() {
if (!startTime.empty()) {
if (endTime.empty()) {
// If no end time was given then filter up to now
- view->filterBetweenExecDate(DateAndTime(startTime));
+ view->filterBetweenExecDate(
+ DateAndTimeHelpers::createFromISO8601(startTime));
} else {
- view->filterBetweenExecDate(DateAndTime(startTime), DateAndTime(endTime));
+ view->filterBetweenExecDate(
+ DateAndTimeHelpers::createFromISO8601(startTime),
+ DateAndTimeHelpers::createFromISO8601(endTime));
}
}
diff --git a/Framework/Algorithms/src/GeneratePythonScript.cpp b/Framework/Algorithms/src/GeneratePythonScript.cpp
index 01ee8704fcf951b7ea6119890d47ff0c0de46658..bb7f5c6ab69c2a6542ec57b0b4d32f21123e0c97 100644
--- a/Framework/Algorithms/src/GeneratePythonScript.cpp
+++ b/Framework/Algorithms/src/GeneratePythonScript.cpp
@@ -1,15 +1,17 @@
#include "MantidAlgorithms/GeneratePythonScript.h"
-#include "MantidKernel/ListValidator.h"
-#include "MantidKernel/System.h"
-#include "MantidAPI/FileProperty.h"
-#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AlgorithmHistory.h"
+#include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/FileProperty.h"
#include "MantidAPI/ScriptBuilder.h"
#include "MantidAPI/Workspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/System.h"
#include <fstream>
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
using namespace Mantid::API;
namespace {
@@ -23,7 +25,7 @@ namespace Algorithms {
DECLARE_ALGORITHM(GeneratePythonScript)
/** Initialize the algorithm's properties.
-*/
+ */
void GeneratePythonScript::init() {
declareProperty(make_unique<WorkspaceProperty<Workspace>>(
"InputWorkspace", "", Direction::Input),
@@ -59,7 +61,7 @@ void GeneratePythonScript::init() {
}
/** Execute the algorithm.
-*/
+ */
void GeneratePythonScript::exec() {
const Workspace_const_sptr ws = getProperty("InputWorkspace");
const bool unrollAll = getProperty("UnrollAll");
@@ -82,9 +84,12 @@ void GeneratePythonScript::exec() {
if (!startTime.empty()) {
if (endTime.empty()) {
// If no end time was given then filter up to now
- view->filterBetweenExecDate(DateAndTime(startTime));
+ view->filterBetweenExecDate(
+ DateAndTimeHelpers::createFromISO8601(startTime));
} else {
- view->filterBetweenExecDate(DateAndTime(startTime), DateAndTime(endTime));
+ view->filterBetweenExecDate(
+ DateAndTimeHelpers::createFromISO8601(startTime),
+ DateAndTimeHelpers::createFromISO8601(endTime));
}
}
diff --git a/Framework/Algorithms/src/GetAllEi.cpp b/Framework/Algorithms/src/GetAllEi.cpp
index ce1be24a33b0e93bf90759afeee000adac26da80..e42d19434fa334dabdbca5e89c09fc45cc9cfdbb 100644
--- a/Framework/Algorithms/src/GetAllEi.cpp
+++ b/Framework/Algorithms/src/GetAllEi.cpp
@@ -1036,10 +1036,10 @@ namespace { // former lambda function for findChopSpeedAndDelay
*@return true if selection interval is completed
* (current interval is not selected) and false otherwise
*/
-bool SelectInterval(const Kernel::DateAndTime &t_beg,
- const Kernel::DateAndTime &t_end, double value,
- bool &inSelection, Kernel::DateAndTime &startTime,
- Kernel::DateAndTime &endTime) {
+bool SelectInterval(const Mantid::Types::DateAndTime &t_beg,
+ const Mantid::Types::DateAndTime &t_end, double value,
+ bool &inSelection, Mantid::Types::DateAndTime &startTime,
+ Mantid::Types::DateAndTime &endTime) {
if (value > 0) {
if (!inSelection) {
@@ -1074,14 +1074,14 @@ void GetAllEi::findChopSpeedAndDelay(const API::MatrixWorkspace_sptr &inputWS,
// Define selecting function
bool inSelection(false);
// time interval to select (start-end)
- Kernel::DateAndTime startTime, endTime;
+ Mantid::Types::DateAndTime startTime, endTime;
//
// Analyze filtering log
auto dateAndTimes = m_pFilterLog->valueAsCorrectMap();
auto it = dateAndTimes.begin();
auto next = it;
next++;
- std::map<Kernel::DateAndTime, double> derivMap;
+ std::map<Mantid::Types::DateAndTime, double> derivMap;
auto itder = it;
if (m_FilterWithDerivative) {
pDerivative = m_pFilterLog->getDerivative();
diff --git a/Framework/Algorithms/src/GetTimeSeriesLogInformation.cpp b/Framework/Algorithms/src/GetTimeSeriesLogInformation.cpp
index dad226b6dd9d17dfb841f592fc351ab99b4ec002..9dcf061596a33b91325d571859ef164a446e7daf 100644
--- a/Framework/Algorithms/src/GetTimeSeriesLogInformation.cpp
+++ b/Framework/Algorithms/src/GetTimeSeriesLogInformation.cpp
@@ -1,22 +1,26 @@
#include "MantidAlgorithms/GetTimeSeriesLogInformation.h"
-#include "MantidAPI/WorkspaceProperty.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidAPI/WorkspaceProperty.h"
#include "MantidDataObjects/EventList.h"
+#include "MantidDataObjects/EventWorkspace.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/ListValidator.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <algorithm>
#include <fstream>
-#include "MantidKernel/ListValidator.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
using namespace std;
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Algorithms {
@@ -230,9 +234,9 @@ void GetTimeSeriesLogInformation::processTimeRange() {
/** Convert a value in nanosecond to DateAndTime. The value is treated as an
* absolute time from
- * 1990.01.01
- */
-Kernel::DateAndTime
+ * 1990.01.01
+ */
+Mantid::Types::DateAndTime
GetTimeSeriesLogInformation::getAbsoluteTime(double abstimens) {
DateAndTime temptime(static_cast<int64_t>(abstimens));
@@ -240,9 +244,9 @@ GetTimeSeriesLogInformation::getAbsoluteTime(double abstimens) {
}
/** Calculate the time from a given relative time from run start
- * @param deltatime :: double as a relative time to run start time in second
- */
-Kernel::DateAndTime
+ * @param deltatime :: double as a relative time to run start time in second
+ */
+Mantid::Types::DateAndTime
GetTimeSeriesLogInformation::calculateRelativeTime(double deltatime) {
int64_t totaltime =
m_starttime.totalNanoseconds() + static_cast<int64_t>(deltatime * 1.0E9);
@@ -252,7 +256,7 @@ GetTimeSeriesLogInformation::calculateRelativeTime(double deltatime) {
}
/** Generate statistic information table workspace
- */
+ */
TableWorkspace_sptr GetTimeSeriesLogInformation::generateStatisticTable() {
auto tablews = boost::make_shared<TableWorkspace>();
@@ -302,7 +306,8 @@ void GetTimeSeriesLogInformation::exportErrorLog(MatrixWorkspace_sptr ws,
std::ofstream ofs;
ofs.open(ofilename.c_str(), std::ios::out);
- Kernel::DateAndTime t0(ws->run().getProperty("run_start")->value());
+ DateAndTime t0 = DateAndTimeHelpers::createFromISO8601(
+ ws->run().getProperty("run_start")->value());
for (size_t i = 1; i < abstimevec.size(); i++) {
double tempdts = static_cast<double>(abstimevec[i].totalNanoseconds() -
@@ -333,13 +338,13 @@ void GetTimeSeriesLogInformation::exportErrorLog(MatrixWorkspace_sptr ws,
}
/** Output distributions in order for a better understanding of the log
- * Result is written to a Workspace2D
- *
- * @param timevec :: a vector of time stamps
- * @param stepsize :: resolution of the delta time count bin
- */
+ * Result is written to a Workspace2D
+ *
+ * @param timevec :: a vector of time stamps
+ * @param stepsize :: resolution of the delta time count bin
+ */
Workspace2D_sptr GetTimeSeriesLogInformation::calDistributions(
- std::vector<Kernel::DateAndTime> timevec, double stepsize) {
+ std::vector<Mantid::Types::DateAndTime> timevec, double stepsize) {
// 1. Get a vector of delta T (in unit of seconds)
double dtmin = static_cast<double>(timevec.back().totalNanoseconds() -
timevec[0].totalNanoseconds()) *
@@ -415,8 +420,8 @@ void GetTimeSeriesLogInformation::checkLogBasicInforamtion() {
size_t countsame = 0;
size_t countinverse = 0;
for (size_t i = 1; i < m_timeVec.size(); i++) {
- Kernel::DateAndTime tprev = m_timeVec[i - 1];
- Kernel::DateAndTime tpres = m_timeVec[i];
+ Mantid::Types::DateAndTime tprev = m_timeVec[i - 1];
+ Mantid::Types::DateAndTime tpres = m_timeVec[i];
if (tprev == tpres)
countsame++;
else if (tprev > tpres)
@@ -561,5 +566,5 @@ void GetTimeSeriesLogInformation::checkLogValueChanging(
g_log.debug() << ss.str();
}
-} // namespace Mantid
} // namespace Algorithms
+} // namespace Mantid
diff --git a/Framework/Algorithms/src/Pause.cpp b/Framework/Algorithms/src/Pause.cpp
index 9eed799b21f036851e216ea5e2f04666f0cb9ec4..4b77b48be20945a1bd296e9638872e3918f7891d 100644
--- a/Framework/Algorithms/src/Pause.cpp
+++ b/Framework/Algorithms/src/Pause.cpp
@@ -1,12 +1,14 @@
#include "MantidAlgorithms/Pause.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <Poco/Thread.h>
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp b/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
index 0c27dfbe9ef721d6834194da8ece8c5bfc45a0f0..8b8ccfd227048bd342a76fcaf76e59746b8e46bf 100644
--- a/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
+++ b/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
@@ -9,19 +9,20 @@
#include "MantidAPI/TableRow.h"
#include "MantidAPI/TextAxis.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidAPI/WorkspaceGroup.h"
#include "MantidAlgorithms/PlotAsymmetryByLogValue.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/MandatoryValidator.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "Poco/File.h"
#include <MantidAPI/FileFinder.h>
-#include "MantidAPI/WorkspaceGroup.h"
namespace // anonymous
- {
+{
/**
* Convert a log property to a double value.
@@ -58,7 +59,7 @@ bool convertLogToDouble(const Mantid::Kernel::Property *property, double &value,
return false;
}
-} // anonymous
+} // namespace
namespace Mantid {
namespace Algorithms {
@@ -80,8 +81,8 @@ PlotAsymmetryByLogValue::PlotAsymmetryByLogValue()
m_firstStart_ns(0) {}
/** Initialisation method. Declares properties to be used in algorithm.
-*
-*/
+ *
+ */
void PlotAsymmetryByLogValue::init() {
std::string nexusExt(".nxs");
@@ -146,8 +147,8 @@ void PlotAsymmetryByLogValue::init() {
}
/**
-* Executes the algorithm
-*/
+ * Executes the algorithm
+ */
void PlotAsymmetryByLogValue::exec() {
// Check input properties to decide whether or not we can reuse previous
@@ -185,7 +186,7 @@ void PlotAsymmetryByLogValue::exec() {
nplots, // the number of plots
npoints, // the number of data points on a plot
npoints // it's not a histogram
- );
+ );
// Populate output workspace with data
populateOutputWorkspace(outWS, nplots);
// Assign the result to the output workspace property
@@ -198,9 +199,9 @@ void PlotAsymmetryByLogValue::exec() {
}
/** Checks input properties and compares them to previous values
-* @param is :: [output] Number of the first run
-* @param ie :: [output] Number of the last run
-*/
+ * @param is :: [output] Number of the first run
+ * @param ie :: [output] Number of the last run
+ */
void PlotAsymmetryByLogValue::checkProperties(size_t &is, size_t &ie) {
// Log Value
@@ -302,10 +303,10 @@ void PlotAsymmetryByLogValue::checkProperties(size_t &is, size_t &ie) {
}
/** Loads one run and applies dead-time corrections and detector grouping if
-* required
-* @param runNumber :: [input] Run number specifying run to load
-* @return :: Loaded workspace
-*/
+ * required
+ * @param runNumber :: [input] Run number specifying run to load
+ * @return :: Loaded workspace
+ */
Workspace_sptr PlotAsymmetryByLogValue::doLoad(size_t runNumber) {
// Get complete run name
@@ -362,9 +363,9 @@ Workspace_sptr PlotAsymmetryByLogValue::doLoad(size_t runNumber) {
}
/** Load dead-time corrections from specified file
-* @param deadTimeFile :: [input] File to read corrections from
-* @return :: Deadtime corrections loaded from file
-*/
+ * @param deadTimeFile :: [input] File to read corrections from
+ * @return :: Deadtime corrections loaded from file
+ */
Workspace_sptr PlotAsymmetryByLogValue::loadCorrectionsFromFile(
const std::string &deadTimeFile) {
@@ -377,9 +378,9 @@ Workspace_sptr PlotAsymmetryByLogValue::loadCorrectionsFromFile(
}
/** Populate output workspace with results
-* @param outWS :: [input/output] Output workspace to populate
-* @param nplots :: [input] Number of histograms
-*/
+ * @param outWS :: [input/output] Output workspace to populate
+ * @param nplots :: [input] Number of histograms
+ */
void PlotAsymmetryByLogValue::populateOutputWorkspace(
MatrixWorkspace_sptr &outWS, int nplots) {
@@ -422,9 +423,9 @@ void PlotAsymmetryByLogValue::populateOutputWorkspace(
}
/** Populate output workspace with results
-* @param outWS :: [input/output] Output workspace to populate
-* @param nplots :: [input] Number of histograms
-*/
+ * @param outWS :: [input/output] Output workspace to populate
+ * @param nplots :: [input] Number of histograms
+ */
void PlotAsymmetryByLogValue::saveResultsToADS(MatrixWorkspace_sptr &outWS,
int nplots) {
@@ -467,12 +468,12 @@ void PlotAsymmetryByLogValue::saveResultsToADS(MatrixWorkspace_sptr &outWS,
}
/** Parse run names
-* @param firstFN :: [input/output] First run's name
-* @param lastFN :: [input/output] Last run's name
-* @param fnBase :: [output] Runs base name
-* @param fnExt :: [output] Runs extension
-* @param fnZeros :: [output] Number of zeros in run's name
-*/
+ * @param firstFN :: [input/output] First run's name
+ * @param lastFN :: [input/output] Last run's name
+ * @param fnBase :: [output] Runs base name
+ * @param fnExt :: [output] Runs extension
+ * @param fnZeros :: [output] Number of zeros in run's name
+ */
void PlotAsymmetryByLogValue::parseRunNames(std::string &firstFN,
std::string &lastFN,
std::string &fnBase,
@@ -548,10 +549,10 @@ void PlotAsymmetryByLogValue::parseRunNames(std::string &firstFN,
}
/** Apply dead-time corrections. The calculation is done by ApplyDeadTimeCorr
-* algorithm
-* @param loadedWs :: [input/output] Workspace to apply corrections to
-* @param deadTimes :: [input] Corrections to apply
-*/
+ * algorithm
+ * @param loadedWs :: [input/output] Workspace to apply corrections to
+ * @param deadTimes :: [input] Corrections to apply
+ */
void PlotAsymmetryByLogValue::applyDeadtimeCorr(Workspace_sptr &loadedWs,
Workspace_sptr deadTimes) {
ScopedWorkspace ws(loadedWs);
@@ -572,10 +573,10 @@ void PlotAsymmetryByLogValue::applyDeadtimeCorr(Workspace_sptr &loadedWs,
}
/** Creates grouping table from supplied forward and backward spectra
-* @param fwd :: [Input] Forward spectra
-* @param bwd :: [Input] Backward spectra
-* @return :: Workspace containing custom grouping
-*/
+ * @param fwd :: [Input] Forward spectra
+ * @param bwd :: [Input] Backward spectra
+ * @return :: Workspace containing custom grouping
+ */
Workspace_sptr
PlotAsymmetryByLogValue::createCustomGrouping(const std::vector<int> &fwd,
const std::vector<int> &bwd) {
@@ -592,9 +593,9 @@ PlotAsymmetryByLogValue::createCustomGrouping(const std::vector<int> &fwd,
}
/** Group detectors from table
-* @param loadedWs :: [input/output] Workspace to apply grouping to
-* @param grouping :: [input] Workspace containing grouping to apply
-*/
+ * @param loadedWs :: [input/output] Workspace to apply grouping to
+ * @param grouping :: [input] Workspace containing grouping to apply
+ */
void PlotAsymmetryByLogValue::groupDetectors(Workspace_sptr &loadedWs,
Workspace_sptr grouping) {
@@ -614,9 +615,9 @@ void PlotAsymmetryByLogValue::groupDetectors(Workspace_sptr &loadedWs,
}
/** Performs asymmetry analysis on a loaded workspace
-* @param loadedWs :: [input] Workspace to apply analysis to
-* @param index :: [input] Vector index where results will be stored
-*/
+ * @param loadedWs :: [input] Workspace to apply analysis to
+ * @param index :: [input] Vector index where results will be stored
+ */
void PlotAsymmetryByLogValue::doAnalysis(Workspace_sptr loadedWs,
size_t index) {
@@ -682,11 +683,11 @@ void PlotAsymmetryByLogValue::doAnalysis(Workspace_sptr loadedWs,
}
/** Calculate the integral asymmetry for a workspace.
-* The calculation is done by AsymmetryCalc and Integration algorithms.
-* @param ws :: The workspace
-* @param Y :: Reference to a variable receiving the value of asymmetry
-* @param E :: Reference to a variable receiving the value of the error
-*/
+ * The calculation is done by AsymmetryCalc and Integration algorithms.
+ * @param ws :: The workspace
+ * @param Y :: Reference to a variable receiving the value of asymmetry
+ * @param E :: Reference to a variable receiving the value of the error
+ */
void PlotAsymmetryByLogValue::calcIntAsymmetry(MatrixWorkspace_sptr ws,
double &Y, double &E) {
@@ -730,11 +731,11 @@ void PlotAsymmetryByLogValue::calcIntAsymmetry(MatrixWorkspace_sptr ws,
}
/** Calculate the integral asymmetry for a pair of workspaces (red & green).
-* @param ws_red :: The red workspace
-* @param ws_green :: The green workspace
-* @param Y :: Reference to a variable receiving the value of asymmetry
-* @param E :: Reference to a variable receiving the value of the error
-*/
+ * @param ws_red :: The red workspace
+ * @param ws_green :: The green workspace
+ * @param Y :: Reference to a variable receiving the value of asymmetry
+ * @param E :: Reference to a variable receiving the value of the error
+ */
void PlotAsymmetryByLogValue::calcIntAsymmetry(MatrixWorkspace_sptr ws_red,
MatrixWorkspace_sptr ws_green,
double &Y, double &E) {
@@ -808,10 +809,12 @@ double PlotAsymmetryByLogValue::getLogValue(MatrixWorkspace &ws) {
const Run &run = ws.run();
// Get the start & end time for the run
- Mantid::Kernel::DateAndTime start, end;
+ Mantid::Types::DateAndTime start, end;
if (run.hasProperty("run_start") && run.hasProperty("run_end")) {
- start = run.getProperty("run_start")->value();
- end = run.getProperty("run_end")->value();
+ start = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ run.getProperty("run_start")->value());
+ end = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ run.getProperty("run_end")->value());
}
// If this is the first run, cache the start time
@@ -868,5 +871,5 @@ double PlotAsymmetryByLogValue::getLogValue(MatrixWorkspace &ws) {
" cannot be converted to a double type.");
}
-} // namespace Algorithm
+} // namespace Algorithms
} // namespace Mantid
diff --git a/Framework/Algorithms/src/RebinByTimeBase.cpp b/Framework/Algorithms/src/RebinByTimeBase.cpp
index 0b2a577a6e281b8d64ed06b2315a2851870ccea8..99084538a8a114f2ded89aa9eb462b02ca6931a2 100644
--- a/Framework/Algorithms/src/RebinByTimeBase.cpp
+++ b/Framework/Algorithms/src/RebinByTimeBase.cpp
@@ -16,6 +16,7 @@ namespace Algorithms {
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
/**
Helper method to transform a MantidVector containing absolute times in
diff --git a/Framework/Algorithms/src/RunCombinationHelpers/SampleLogsBehaviour.cpp b/Framework/Algorithms/src/RunCombinationHelpers/SampleLogsBehaviour.cpp
index dad6f6f1454b57d9621a560a8d341b1ef9043226..26c2d6420aedee94b05d4ede0f0809e46735e7d5 100644
--- a/Framework/Algorithms/src/RunCombinationHelpers/SampleLogsBehaviour.cpp
+++ b/Framework/Algorithms/src/RunCombinationHelpers/SampleLogsBehaviour.cpp
@@ -510,7 +510,7 @@ void SampleLogsBehaviour::updateTimeSeriesProperty(MatrixWorkspace &addeeWS,
} catch (std::invalid_argument &) {
auto timeSeriesProp =
outWS.mutableRun().getTimeSeriesProperty<double>(name);
- Kernel::DateAndTime startTime = addeeWS.mutableRun().startTime();
+ Mantid::Types::DateAndTime startTime = addeeWS.mutableRun().startTime();
double value = addeeWS.mutableRun().getLogAsSingleValue(name);
timeSeriesProp->addValue(startTime, value);
// Remove this to supress a warning, we will put it back after adding the
diff --git a/Framework/Algorithms/src/ShiftLogTime.cpp b/Framework/Algorithms/src/ShiftLogTime.cpp
index de6a43d7442453fe5407ddc4f4fb5aa3588a8b30..cb4df45c072d3e4e40a4f90f7fa50d0661c93b15 100644
--- a/Framework/Algorithms/src/ShiftLogTime.cpp
+++ b/Framework/Algorithms/src/ShiftLogTime.cpp
@@ -11,6 +11,7 @@ using namespace Mantid::API;
using std::string;
using std::stringstream;
using std::vector;
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace Algorithms {
diff --git a/Framework/Algorithms/src/SumEventsByLogValue.cpp b/Framework/Algorithms/src/SumEventsByLogValue.cpp
index fe6886489006bcc658317ad0848328d1345c36b0..9216c3ea5770ed35a2fca81e69fa3d343bb4d975 100644
--- a/Framework/Algorithms/src/SumEventsByLogValue.cpp
+++ b/Framework/Algorithms/src/SumEventsByLogValue.cpp
@@ -10,6 +10,7 @@
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/MandatoryValidator.h"
#include "MantidKernel/RebinParamsValidator.h"
+#include "MantidKernel/TimeInterval.h"
#include "MantidKernel/VectorHelper.h"
#include <numeric>
diff --git a/Framework/Algorithms/test/AddNoteTest.h b/Framework/Algorithms/test/AddNoteTest.h
index f35be8902d98d76ac1a0554cb3270e06bad6b571..a261ee5b90acb0f9116f3cb017e226f92e23c18a 100644
--- a/Framework/Algorithms/test/AddNoteTest.h
+++ b/Framework/Algorithms/test/AddNoteTest.h
@@ -1,10 +1,13 @@
#ifndef MANTID_ALGORITHMS_ADDNOTETEST_H_
#define MANTID_ALGORITHMS_ADDNOTETEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidAlgorithms/AddNote.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include <cxxtest/TestSuite.h>
+
+using namespace Mantid::Types;
class AddNoteTest : public CxxTest::TestSuite {
@@ -35,7 +38,7 @@ public:
// Get Current Date Time
namespace pt = boost::posix_time;
auto dateTimeObj =
- Mantid::Kernel::DateAndTime(pt::second_clock::local_time());
+ Mantid::Types::DateAndTime(pt::second_clock::local_time());
std::string time = dateTimeObj.toISO8601String();
std::string timeOffset = time;
TS_ASSERT_THROWS_NOTHING(
@@ -109,7 +112,6 @@ private:
const int &logEndTime,
const std::string logValue,
const size_t position) {
- using Mantid::Kernel::DateAndTime;
using Mantid::Kernel::TimeSeriesProperty;
const auto &run = testWS->run();
@@ -125,7 +127,8 @@ private:
TS_ASSERT(times.size() >= position + 1);
auto values = timeSeries->valuesAsVector();
if (logEndTime == 0) {
- TS_ASSERT_EQUALS(DateAndTime(logStartTime), times[position]);
+ TS_ASSERT_EQUALS(DateAndTimeHelpers::createFromISO8601(logStartTime),
+ times[position]);
} else {
int logMinTime = 0, logMaxTime = 0;
TS_ASSERT_THROWS_NOTHING(
diff --git a/Framework/Algorithms/test/AddSampleLogTest.h b/Framework/Algorithms/test/AddSampleLogTest.h
index 5c0d652948db997417d907efb3fb6d4b1f68e15a..322af463f32436ea8d7220e44602662089a8415d 100644
--- a/Framework/Algorithms/test/AddSampleLogTest.h
+++ b/Framework/Algorithms/test/AddSampleLogTest.h
@@ -5,14 +5,16 @@
#include <string>
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAlgorithms/AddSampleLog.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Algorithms;
+using namespace Mantid::Types;
class AddSampleLogTest : public CxxTest::TestSuite {
public:
@@ -60,8 +62,9 @@ public:
void test_NumberSeries() {
MatrixWorkspace_sptr ws =
WorkspaceCreationHelper::create2DWorkspace(10, 10);
- ws->mutableRun().setStartAndEndTime(DateAndTime("2013-12-18T13:40:00"),
- DateAndTime("2013-12-18T13:42:00"));
+ ws->mutableRun().setStartAndEndTime(
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:40:00"),
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:42:00"));
ExecuteAlgorithm(ws, "My Name NS1", "Number Series", "1.234", 1.234);
ExecuteAlgorithm(ws, "My Name NS1", "Number Series", "2.456", 2.456);
// Only double is allowed if using default type
@@ -74,8 +77,9 @@ public:
void test_Units() {
MatrixWorkspace_sptr ws =
WorkspaceCreationHelper::create2DWorkspace(10, 10);
- ws->mutableRun().setStartAndEndTime(DateAndTime("2013-12-18T13:40:00"),
- DateAndTime("2013-12-18T13:42:00"));
+ ws->mutableRun().setStartAndEndTime(
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:40:00"),
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:42:00"));
ExecuteAlgorithm(ws, "My Name", "Number Series", "1.234", 1.234, false,
"myUnit");
ExecuteAlgorithm(ws, "My New Name", "Number", "963", 963, false,
@@ -87,8 +91,9 @@ public:
void test_number_type() {
MatrixWorkspace_sptr ws =
WorkspaceCreationHelper::create2DWorkspace(10, 10);
- ws->mutableRun().setStartAndEndTime(DateAndTime("2013-12-18T13:40:00"),
- DateAndTime("2013-12-18T13:42:00"));
+ ws->mutableRun().setStartAndEndTime(
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:40:00"),
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:42:00"));
ExecuteAlgorithm(ws, "My Name", "Number Series", "1.234", 1.234, false,
"myUnit", "Double");
ExecuteAlgorithm(ws, "My New Name", "Number", "963", 963, false,
@@ -220,8 +225,9 @@ public:
} else if (LogType == "Number Series") {
auto testProp = dynamic_cast<TimeSeriesProperty<T> *>(prop);
TS_ASSERT(testProp);
- TS_ASSERT_EQUALS(testProp->firstTime(),
- DateAndTime("2013-12-18T13:40:00"));
+ TS_ASSERT_EQUALS(
+ testProp->firstTime(),
+ DateAndTimeHelpers::createFromISO8601("2013-12-18T13:40:00"));
TS_ASSERT_DELTA(testProp->firstValue(), expectedValue, 1e-5);
}
// cleanup
diff --git a/Framework/Algorithms/test/AddTimeSeriesLogTest.h b/Framework/Algorithms/test/AddTimeSeriesLogTest.h
index 682fe50fb867080daad80c1c6921d0dc9f0f806b..2814df67e08f243a3e1bb02f4e2473591dd1c5a2 100644
--- a/Framework/Algorithms/test/AddTimeSeriesLogTest.h
+++ b/Framework/Algorithms/test/AddTimeSeriesLogTest.h
@@ -1,10 +1,13 @@
#ifndef MANTID_ALGORITHMS_ADDTIMESERIESLOGTEST_H_
#define MANTID_ALGORITHMS_ADDTIMESERIESLOGTEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidAlgorithms/AddTimeSeriesLog.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include <cxxtest/TestSuite.h>
+
+using namespace Mantid::Types;
class AddTimeSeriesLogTest : public CxxTest::TestSuite {
private:
@@ -153,7 +156,6 @@ private:
const std::string &logName,
const std::string &logTime, const T logValue,
const size_t position) {
- using Mantid::Kernel::DateAndTime;
using Mantid::Kernel::TimeSeriesProperty;
const auto &run = testWS->run();
@@ -168,7 +170,8 @@ private:
auto times = timeSeries->timesAsVector();
TS_ASSERT(times.size() >= position + 1);
auto values = timeSeries->valuesAsVector();
- TS_ASSERT_EQUALS(DateAndTime(logTime), times[position]);
+ TS_ASSERT_EQUALS(DateAndTimeHelpers::createFromISO8601(logTime),
+ times[position]);
TS_ASSERT(values.size() >= position + 1);
TS_ASSERT_EQUALS(logValue, values[position]);
diff --git a/Framework/Algorithms/test/AppendSpectraTest.h b/Framework/Algorithms/test/AppendSpectraTest.h
index 97d897703701a0755e23a9ada3f4aac48f7520cc..548f722ef820a78be90d8a6b6e18fc9a2c0f60f5 100644
--- a/Framework/Algorithms/test/AppendSpectraTest.h
+++ b/Framework/Algorithms/test/AppendSpectraTest.h
@@ -7,6 +7,7 @@
#include "MantidAPI/SpectrumInfo.h"
#include "MantidAlgorithms/AppendSpectra.h"
#include "MantidDataHandling/LoadRaw3.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/InstrumentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -17,6 +18,7 @@ using namespace Mantid::Algorithms;
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
class AppendSpectraTest : public CxxTest::TestSuite {
public:
@@ -183,11 +185,13 @@ public:
"");
auto ws1Log = new TimeSeriesProperty<std::string>("aLog");
- ws1Log->addValue(DateAndTime("2014-06-19T16:40:00"), "Hello");
+ ws1Log->addValue(
+ DateAndTimeHelpers::createFromISO8601("2014-06-19T16:40:00"), "Hello");
ws1->mutableRun().addLogData(ws1Log);
auto ws2Log = new TimeSeriesProperty<std::string>("aLog");
- ws2Log->addValue(DateAndTime("2014-06-19T16:40:10"), "World");
+ ws2Log->addValue(
+ DateAndTimeHelpers::createFromISO8601("2014-06-19T16:40:10"), "World");
ws2->mutableRun().addLogData(ws2Log);
AnalysisDataService::Instance().addOrReplace(ws1Name, ws1);
@@ -409,7 +413,7 @@ private:
TS_ASSERT(appendSpectra->isExecuted());
}
/** Creates a 2D workspace with 5 histograms
- */
+ */
void createWorkspaceWithAxisAndLabel(const std::string outputName,
const std::string &axisType,
const std::string axisValue) {
diff --git a/Framework/Algorithms/test/AverageLogDataTest.h b/Framework/Algorithms/test/AverageLogDataTest.h
index 9fd415828bab13f33c3284cebef7e28d7c767651..17cff239856f6f7fdcfd2ab6b03f5f36dcf9abd8 100644
--- a/Framework/Algorithms/test/AverageLogDataTest.h
+++ b/Framework/Algorithms/test/AverageLogDataTest.h
@@ -4,6 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidAlgorithms/AverageLogData.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -114,7 +115,8 @@ private:
inputWS = "AverageLogDataTestWS";
Mantid::DataObjects::Workspace2D_sptr w =
WorkspaceCreationHelper::create2DWorkspace(1, 1);
- Mantid::Kernel::DateAndTime run_start("2010-01-01T00:00:00");
+ auto run_start = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2010-01-01T00:00:00");
Mantid::Kernel::TimeSeriesProperty<double> *pc, *p1;
pc = new Mantid::Kernel::TimeSeriesProperty<double>("proton_charge");
pc->setUnits("picoCoulomb");
diff --git a/Framework/Algorithms/test/CalculateCountRateTest.h b/Framework/Algorithms/test/CalculateCountRateTest.h
index 6468872581dcea60356f5a820cab5839930946dc..093b3e689499fb017028f6a6629356a89f9f8160 100644
--- a/Framework/Algorithms/test/CalculateCountRateTest.h
+++ b/Framework/Algorithms/test/CalculateCountRateTest.h
@@ -5,11 +5,12 @@
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidAlgorithms/CalculateCountRate.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/Axis.h"
#include "MantidAPI/NumericAxis.h"
+#include "MantidAlgorithms/CalculateCountRate.h"
#include "MantidHistogramData/HistogramX.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <numeric>
@@ -172,8 +173,10 @@ public:
// Check time series log outside of the data range
auto pTime_log = new Kernel::TimeSeriesProperty<double>("proton_charge");
- Kernel::DateAndTime first("2015-11-30T16:17:10");
- std::vector<Kernel::DateAndTime> times(140);
+ Mantid::Types::DateAndTime first =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2015-11-30T16:17:10");
+ std::vector<Mantid::Types::DateAndTime> times(140);
std::vector<double> values(140);
for (size_t i = 0; i < 140; ++i) {
@@ -181,7 +184,7 @@ public:
values[i] = double(i);
}
- // DateAndTime("2010-01-01T00:00:00")
+ // DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00")
pTime_log->addValues(times, values);
sws->mutableRun().addProperty(pTime_log, true);
@@ -194,7 +197,8 @@ public:
TS_ASSERT(!alg.useLogDerivative());
// Check correct date and time
- first = Kernel::DateAndTime("2010-01-01T00:00:00");
+ first = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2010-01-01T00:00:00");
times.resize(240);
values.resize(240);
for (size_t i = 0; i < 240; ++i) {
@@ -468,8 +472,10 @@ public:
}
auto pTime_log = new Kernel::TimeSeriesProperty<double>("proton_charge");
- Kernel::DateAndTime first("2010-01-01T00:00:00");
- std::vector<Kernel::DateAndTime> times(240);
+ Mantid::Types::DateAndTime first =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2010-01-01T00:00:00");
+ std::vector<Mantid::Types::DateAndTime> times(240);
std::vector<double> values(240);
for (size_t i = 0; i < values.size(); ++i) {
diff --git a/Framework/Algorithms/test/ChangeLogTimeTest.h b/Framework/Algorithms/test/ChangeLogTimeTest.h
index 77451ab8b5e1a67a1c70945118b7237275f7f44f..b74c9b56cb0bc6fa49ad7f6b0b59d9525db7945e 100644
--- a/Framework/Algorithms/test/ChangeLogTimeTest.h
+++ b/Framework/Algorithms/test/ChangeLogTimeTest.h
@@ -1,12 +1,13 @@
#ifndef CHANGELOGTIMETEST_H_
#define CHANGELOGTIMETEST_H_
-#include <cxxtest/TestSuite.h>
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/Run.h"
#include "MantidAlgorithms/ChangeLogTime.h"
#include "MantidDataObjects/Workspace2D.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/Run.h"
+#include <cxxtest/TestSuite.h>
using std::string;
using namespace Mantid::Algorithms;
@@ -47,7 +48,8 @@ private:
* @param out_name Name of the output workspace.
*/
void verify(const std::string in_name, const std::string out_name) {
- DateAndTime start(start_str);
+ auto start =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(start_str);
// create a workspace to mess with
Workspace2D_sptr testWorkspace(new Workspace2D);
diff --git a/Framework/Algorithms/test/ChangePulsetime2Test.h b/Framework/Algorithms/test/ChangePulsetime2Test.h
index b1190e3fa6d39daa17f03e60faafebb39a2581b5..07927b3cbba4e509c8fb395fd23a8955db27d1b9 100644
--- a/Framework/Algorithms/test/ChangePulsetime2Test.h
+++ b/Framework/Algorithms/test/ChangePulsetime2Test.h
@@ -8,11 +8,13 @@
#include "MantidAlgorithms/ChangePulsetime2.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Algorithms;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
namespace {
EventWorkspace_sptr
@@ -77,11 +79,11 @@ public:
double secs;
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(wi).getEvent(0).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1000.0, 1e-5);
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(wi).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1001.0, 1e-5);
}
@@ -90,11 +92,11 @@ public:
double secs;
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(0).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1.0, 1e-5);
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(30).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1.0, 1e-5);
}
@@ -103,7 +105,7 @@ public:
double secs;
secs = DateAndTime::secondsFromDuration(
in_ws->getSpectrum(0).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1.0, 1e-5);
}
diff --git a/Framework/Algorithms/test/ChangePulsetimeTest.h b/Framework/Algorithms/test/ChangePulsetimeTest.h
index a28318b755f86edf7ad9f51ca08d072b940d2061..b9e7d950e798f4e834a5f46dbec394cf47f0ae22 100644
--- a/Framework/Algorithms/test/ChangePulsetimeTest.h
+++ b/Framework/Algorithms/test/ChangePulsetimeTest.h
@@ -1,18 +1,20 @@
#ifndef MANTID_ALGORITHMS_CHANGEPULSETIMETEST_H_
#define MANTID_ALGORITHMS_CHANGEPULSETIMETEST_H_
-#include <cxxtest/TestSuite.h>
-#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
+#include "MantidKernel/Timer.h"
+#include <cxxtest/TestSuite.h>
#include "MantidAlgorithms/ChangePulsetime.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Algorithms;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
namespace {
EventWorkspace_sptr
@@ -33,7 +35,7 @@ execute_change_of_pulse_times(EventWorkspace_sptr in_ws, std::string timeOffset,
EventWorkspace_sptr out_ws = alg.getProperty("OutputWorkspace");
return out_ws;
}
-}
+} // namespace
//---------------------------------------------------------------------------------
// Unit Tests
@@ -75,11 +77,11 @@ public:
double secs;
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(wi).getEvent(0).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1000.0, 1e-5);
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(wi).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1001.0, 1e-5);
}
@@ -88,11 +90,11 @@ public:
double secs;
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(0).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1.0, 1e-5);
secs = DateAndTime::secondsFromDuration(
out_ws->getSpectrum(30).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1.0, 1e-5);
}
@@ -101,7 +103,7 @@ public:
double secs;
secs = DateAndTime::secondsFromDuration(
in_ws->getSpectrum(0).getEvent(2).pulseTime() -
- DateAndTime("2010-01-01T00:00:00"));
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
TS_ASSERT_DELTA(secs, 1.0, 1e-5);
}
diff --git a/Framework/Algorithms/test/ChangeTimeZeroTest.h b/Framework/Algorithms/test/ChangeTimeZeroTest.h
index c5d103f8cf39e3c2406e103a6d8b9f6640e2c9d7..2c8a80e9cf343adc0332ddf9686be4fbf9b48e2e 100644
--- a/Framework/Algorithms/test/ChangeTimeZeroTest.h
+++ b/Framework/Algorithms/test/ChangeTimeZeroTest.h
@@ -1,24 +1,26 @@
#ifndef CHANGETIMEZEROTEST_H_
#define CHANGETIMEZEROTEST_H_
-#include <cxxtest/TestSuite.h>
-#include "MantidKernel/Timer.h"
#include "MantidKernel/System.h"
+#include "MantidKernel/Timer.h"
+#include <cxxtest/TestSuite.h>
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/ScopedWorkspace.h"
+#include "MantidAPI/WorkspaceGroup.h"
#include "MantidAlgorithms/ChangeTimeZero.h"
#include "MantidAlgorithms/CloneWorkspace.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/EventList.h"
-#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/WorkspaceGroup.h"
+#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/DateTimeValidator.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Algorithms;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
namespace {
@@ -27,7 +29,8 @@ const std::string boolSeriesID("boolTimeSeries");
const std::string intSeriesID("intTimeSeries");
const std::string stringSeriesID("stringTimeSeries");
const std::string stringID("string");
-DateAndTime stringPropertyTime("2010-01-01T00:10:00");
+DateAndTime stringPropertyTime =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:10:00");
enum LogType { STANDARD, NOPROTONCHARGE };
template <typename T>
@@ -152,7 +155,7 @@ MatrixWorkspace_sptr execute_change_time(MatrixWorkspace_sptr in_ws,
auto out_ws = alg.getProperty("OutputWorkspace");
return out_ws;
}
-}
+} // namespace
class ChangeTimeZeroTest : public CxxTest::TestSuite {
public:
@@ -162,7 +165,8 @@ public:
static void destroySuite(ChangeTimeZeroTest *suite) { delete suite; }
ChangeTimeZeroTest()
- : m_startTime("2010-01-01T00:00:00"),
+ : m_startTime(
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00")),
m_stringPropertyTime(stringPropertyTime),
m_dateTimeValidator(boost::make_shared<DateTimeValidator>()),
m_length(10) {}
@@ -399,12 +403,12 @@ public:
}
/**
- * Test that the algorithm can handle a WorkspaceGroup as input without
- * crashing
- * We have to use the ADS to test WorkspaceGroups
- *
- * Need to use absolute time to test this part of validateInputs
- */
+ * Test that the algorithm can handle a WorkspaceGroup as input without
+ * crashing
+ * We have to use the ADS to test WorkspaceGroups
+ *
+ * Need to use absolute time to test this part of validateInputs
+ */
void testValidateInputsWithWSGroup() {
const double timeShiftDouble = 1000;
DateAndTime absoluteTimeShift = m_startTime + timeShiftDouble;
@@ -471,7 +475,8 @@ private:
double timeShift = relativeTimeShift;
if (relativeTimeShift == 0.0) {
timeShift = DateAndTime::secondsFromDuration(
- DateAndTime(absoluteTimeShift) - m_startTime);
+ DateAndTimeHelpers::createFromISO8601(absoluteTimeShift) -
+ m_startTime);
}
MatrixWorkspace_sptr out_ws = alg.getProperty("OutputWorkspace");
@@ -522,7 +527,7 @@ private:
dynamic_cast<PropertyWithValue<std::string> *>(prop);
auto value = propertyWithValue->value();
if (checkDateTime(value)) {
- DateAndTime newTime(value);
+ DateAndTime newTime = DateAndTimeHelpers::createFromISO8601(value);
double secs =
DateAndTime::secondsFromDuration(newTime - m_stringPropertyTime);
TSM_ASSERT_DELTA("String property should have shifted time", secs,
@@ -599,7 +604,8 @@ private:
public:
void setUp() override {
- DateAndTime date("2010-01-01T00:00:00");
+ DateAndTime date =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
// Set up the Workspace 2D
const int length2D = 3000;
diff --git a/Framework/Algorithms/test/ConvertUnitsTest.h b/Framework/Algorithms/test/ConvertUnitsTest.h
index 614a764a80ab7777630493cb8701dca5196c356f..3e3e21f5a2709bed086366eb50b76eae1a37ec7c 100644
--- a/Framework/Algorithms/test/ConvertUnitsTest.h
+++ b/Framework/Algorithms/test/ConvertUnitsTest.h
@@ -754,9 +754,9 @@ public:
}
} else if (sortType == PULSETIME_SORT) {
// Check directly that it is indeed increasing
- Mantid::Kernel::DateAndTime last_x;
+ Mantid::Types::DateAndTime last_x;
for (size_t i = 0; i < el.getNumberEvents(); i++) {
- Mantid::Kernel::DateAndTime x = el.getEvent(i).pulseTime();
+ Mantid::Types::DateAndTime x = el.getEvent(i).pulseTime();
TS_ASSERT(x >= last_x);
last_x = x;
}
diff --git a/Framework/Algorithms/test/CorelliCrossCorrelateTest.h b/Framework/Algorithms/test/CorelliCrossCorrelateTest.h
index db417481bdfcddaf7fbf11a03dee6f66f577518d..983d8377178ebcb38a89f6a81e39e27e4568dd65 100644
--- a/Framework/Algorithms/test/CorelliCrossCorrelateTest.h
+++ b/Framework/Algorithms/test/CorelliCrossCorrelateTest.h
@@ -3,18 +3,20 @@
#include <cxxtest/TestSuite.h>
-#include "MantidAlgorithms/CorelliCrossCorrelate.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/Axis.h"
#include "MantidAPI/Run.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidAlgorithms/CorelliCrossCorrelate.h"
#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidTypes/DateAndTime.h"
using Mantid::Algorithms::CorelliCrossCorrelate;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class CorelliCrossCorrelateTest : public CxxTest::TestSuite {
public:
@@ -48,7 +50,8 @@ public:
ws = AnalysisDataService::Instance().retrieveWS<EventWorkspace>(
"CorelliCrossCorrelateTest_OutputWS");
- DateAndTime startTime("2007-11-30T16:17:00");
+ DateAndTime startTime =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
auto &evlist = ws->getSpectrum(0);
// Add some events to the workspace.
diff --git a/Framework/Algorithms/test/CreateLogPropertyTableTest.h b/Framework/Algorithms/test/CreateLogPropertyTableTest.h
index 2a631f790ac568e2b1b57d57b642b0421fb54718..19baca432279310cdf81c68adbe817783e32e444 100644
--- a/Framework/Algorithms/test/CreateLogPropertyTableTest.h
+++ b/Framework/Algorithms/test/CreateLogPropertyTableTest.h
@@ -12,6 +12,7 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <string>
#include <vector>
@@ -21,6 +22,7 @@ using namespace Mantid::API;
using namespace Mantid::Algorithms;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
class CreateLogPropertyTableTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/Algorithms/test/EstimateResolutionDiffractionTest.h b/Framework/Algorithms/test/EstimateResolutionDiffractionTest.h
index 90ae83b702172df851add8ad68bcabc0133cf85b..d47e91812605dbb36313c7d369670822922151cc 100644
--- a/Framework/Algorithms/test/EstimateResolutionDiffractionTest.h
+++ b/Framework/Algorithms/test/EstimateResolutionDiffractionTest.h
@@ -8,7 +8,7 @@
#include "MantidAPI/Run.h"
#include "MantidAlgorithms/EstimateResolutionDiffraction.h"
#include "MantidDataHandling/LoadEmptyInstrument.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
using Mantid::Algorithms::EstimateResolutionDiffraction;
@@ -18,6 +18,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
+using namespace Mantid::Types;
class EstimateResolutionDiffractionTest : public CxxTest::TestSuite {
public:
@@ -31,7 +32,7 @@ public:
}
/** Test init
- */
+ */
void test_Init() {
EstimateResolutionDiffraction alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize());
@@ -39,7 +40,7 @@ public:
}
/** Test POWGEN
- */
+ */
void test_EmptyPG3() {
// Create an empty PG3 workspace
MatrixWorkspace_sptr ws = createInstrument();
@@ -72,7 +73,7 @@ public:
}
/** Create an instrument
- */
+ */
API::MatrixWorkspace_sptr createInstrument() {
// Create empty workspace
LoadEmptyInstrument loader;
diff --git a/Framework/Algorithms/test/ExportTimeSeriesLogTest.h b/Framework/Algorithms/test/ExportTimeSeriesLogTest.h
index 5aa38513046aa1b168c9bb3c8df9535937b28fdd..b46cb49414a8c375e841682e4d123bcb48d03f11 100644
--- a/Framework/Algorithms/test/ExportTimeSeriesLogTest.h
+++ b/Framework/Algorithms/test/ExportTimeSeriesLogTest.h
@@ -243,7 +243,7 @@ public:
int64_t runstoptime_ns = 3001000000;
int64_t pulsetime_ns = 100000;
- Kernel::DateAndTime runstarttime(runstarttime_ns);
+ Mantid::Types::DateAndTime runstarttime(runstarttime_ns);
eventws->mutableRun().addProperty("run_start",
runstarttime.toISO8601String());
@@ -252,7 +252,7 @@ public:
new Kernel::TimeSeriesProperty<double>("proton_charge");
int64_t curtime_ns = runstarttime_ns;
while (curtime_ns <= runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
protonchargelog->addValue(curtime, 1.0);
curtime_ns += pulsetime_ns;
}
@@ -265,7 +265,7 @@ public:
curtime_ns = runstarttime_ns;
size_t numevents = 0;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
double value =
sin(M_PI * static_cast<double>(curtime_ns) / period * 0.25);
sinlog->addValue(curtime, value);
@@ -281,7 +281,7 @@ public:
period = static_cast<double>(pulsetime_ns * 10);
curtime_ns = runstarttime_ns;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
double value = sin(2 * M_PI * static_cast<double>(curtime_ns) / period);
coslog->addValue(curtime, value);
curtime_ns += pulsetime_ns * 2;
diff --git a/Framework/Algorithms/test/FilterByLogValueTest.h b/Framework/Algorithms/test/FilterByLogValueTest.h
index 1d9ea52bc630560525cfafb57b404ec2c0556906..ac714540fd3fb82e054284bc0384106cf7e1674a 100644
--- a/Framework/Algorithms/test/FilterByLogValueTest.h
+++ b/Framework/Algorithms/test/FilterByLogValueTest.h
@@ -3,17 +3,19 @@
#include <cxxtest/TestSuite.h>
+#include "MantidAPI/AlgorithmManager.h"
#include "MantidAlgorithms/FilterByLogValue.h"
-#include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidDataObjects/EventWorkspace.h"
-#include "MantidAPI/AlgorithmManager.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidTypes/DateAndTime.h"
using namespace Mantid::Algorithms;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using namespace Mantid::Types;
class FilterByLogValueTest : public CxxTest::TestSuite {
public:
@@ -108,9 +110,10 @@ public:
// Default Event Workspace with times from 0-99
EventWorkspace_sptr ew = WorkspaceCreationHelper::createEventWorkspace2();
- DateAndTime run_start("2010-01-01T00:00:00"); // NOTE This run_start is
- // hard-coded in
- // WorkspaceCreationHelper.
+ DateAndTime run_start = DateAndTimeHelpers::createFromISO8601(
+ "2010-01-01T00:00:00"); // NOTE This run_start is
+ // hard-coded in
+ // WorkspaceCreationHelper.
TimeSeriesProperty<double> *temp;
temp = new TimeSeriesProperty<double>("temp");
diff --git a/Framework/Algorithms/test/FilterByTime2Test.h b/Framework/Algorithms/test/FilterByTime2Test.h
index 8280809e9c468e4f52d8f178889991a1cff37455..3fd0d151cf82937166e0b198886a04505a8e0639 100644
--- a/Framework/Algorithms/test/FilterByTime2Test.h
+++ b/Framework/Algorithms/test/FilterByTime2Test.h
@@ -12,10 +12,10 @@
#include "MantidAlgorithms/FilterByTime2.h"
#include "MantidDataHandling/LoadEventPreNexus2.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
using namespace Mantid::Algorithms;
using namespace Mantid::DataHandling;
diff --git a/Framework/Algorithms/test/FilterByTimeTest.h b/Framework/Algorithms/test/FilterByTimeTest.h
index a304c4dcda3c1b177a50f59027a7edca33a32a19..9d3ab3411087a6dbc965974c2fd4aa728a541fb7 100644
--- a/Framework/Algorithms/test/FilterByTimeTest.h
+++ b/Framework/Algorithms/test/FilterByTimeTest.h
@@ -12,10 +12,11 @@
#include "MantidAlgorithms/FilterByTime.h"
#include "MantidDataHandling/LoadEventNexus.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidDataObjects/EventWorkspace.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidTypes/DateAndTime.h"
using namespace Mantid::Algorithms;
using namespace Mantid::DataHandling;
@@ -38,9 +39,10 @@ public:
TimeSeriesProperty<double> *pc =
new TimeSeriesProperty<double>("proton_charge");
pc->setUnits("picoCoulomb");
- DateAndTime run_start("2010-01-01T00:00:00"); // NOTE This run_start is
- // hard-coded in
- // WorkspaceCreationHelper.
+ auto run_start = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2010-01-01T00:00:00"); // NOTE This run_start is
+ // hard-coded in
+ // WorkspaceCreationHelper.
for (double i = 0; i < 100; i++)
pc->addValue(run_start + i, 1.0);
ws->mutableRun().addProperty(pc);
diff --git a/Framework/Algorithms/test/FilterEventsTest.h b/Framework/Algorithms/test/FilterEventsTest.h
index 35db9248ecb42d826f26504094da8e9e0f81822e..be386fe941cbc0110266da9a16e409d7c26cf66c 100644
--- a/Framework/Algorithms/test/FilterEventsTest.h
+++ b/Framework/Algorithms/test/FilterEventsTest.h
@@ -161,9 +161,9 @@ public:
filteredws0->run().getProperty("splitter"));
TS_ASSERT(splitter0);
TS_ASSERT_EQUALS(splitter0->size(), 2);
- TS_ASSERT_EQUALS(splitter0->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter0->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter0->nthValue(0), 1);
- TS_ASSERT_EQUALS(splitter0->nthTime(1), Kernel::DateAndTime(20035000000));
+ TS_ASSERT_EQUALS(splitter0->nthTime(1), Mantid::Types::DateAndTime(20035000000));
TS_ASSERT_EQUALS(splitter0->nthValue(1), 0);
// Check Workspace group 1
@@ -181,11 +181,11 @@ public:
filteredws1->run().getProperty("splitter"));
TS_ASSERT(splitter1);
TS_ASSERT_EQUALS(splitter1->size(), 3);
- TS_ASSERT_EQUALS(splitter1->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter1->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter1->nthValue(0), 0);
- TS_ASSERT_EQUALS(splitter1->nthTime(1), Kernel::DateAndTime(20035000000));
+ TS_ASSERT_EQUALS(splitter1->nthTime(1), Mantid::Types::DateAndTime(20035000000));
TS_ASSERT_EQUALS(splitter1->nthValue(1), 1);
- TS_ASSERT_EQUALS(splitter1->nthTime(2), Kernel::DateAndTime(20195000000));
+ TS_ASSERT_EQUALS(splitter1->nthTime(2), Mantid::Types::DateAndTime(20195000000));
TS_ASSERT_EQUALS(splitter1->nthValue(2), 0);
// Check Workspace group 2
@@ -218,22 +218,22 @@ public:
TS_ASSERT(splitter2);
TS_ASSERT_EQUALS(splitter2->size(), 7);
- TS_ASSERT_EQUALS(splitter2->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter2->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter2->nthValue(0), 0);
- TS_ASSERT_EQUALS(splitter2->nthTime(1), Kernel::DateAndTime(20200000000));
+ TS_ASSERT_EQUALS(splitter2->nthTime(1), Mantid::Types::DateAndTime(20200000000));
TS_ASSERT_EQUALS(splitter2->nthValue(1), 1);
- TS_ASSERT_EQUALS(splitter2->nthTime(2), Kernel::DateAndTime(20265000000));
+ TS_ASSERT_EQUALS(splitter2->nthTime(2), Mantid::Types::DateAndTime(20265000000));
TS_ASSERT_EQUALS(splitter2->nthValue(2), 0);
- TS_ASSERT_EQUALS(splitter2->nthTime(3), Kernel::DateAndTime(20300000000));
+ TS_ASSERT_EQUALS(splitter2->nthTime(3), Mantid::Types::DateAndTime(20300000000));
TS_ASSERT_EQUALS(splitter2->nthValue(3), 1);
- TS_ASSERT_EQUALS(splitter2->nthTime(4), Kernel::DateAndTime(20365000000));
+ TS_ASSERT_EQUALS(splitter2->nthTime(4), Mantid::Types::DateAndTime(20365000000));
TS_ASSERT_EQUALS(splitter2->nthValue(4), 0);
- TS_ASSERT_EQUALS(splitter2->nthTime(5), Kernel::DateAndTime(20400000000));
+ TS_ASSERT_EQUALS(splitter2->nthTime(5), Mantid::Types::DateAndTime(20400000000));
TS_ASSERT_EQUALS(splitter2->nthValue(5), 1);
- TS_ASSERT_EQUALS(splitter2->nthTime(6), Kernel::DateAndTime(20465000000));
+ TS_ASSERT_EQUALS(splitter2->nthTime(6), Mantid::Types::DateAndTime(20465000000));
TS_ASSERT_EQUALS(splitter2->nthValue(6), 0);
// Clean up
@@ -679,11 +679,11 @@ public:
filteredws0->run().getProperty("splitter"));
TS_ASSERT(splitter0);
TS_ASSERT_EQUALS(splitter0->size(), 2);
- TS_ASSERT_EQUALS(splitter0->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter0->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter0->nthValue(0), 1);
TS_ASSERT_EQUALS(
splitter0->nthTime(1).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter0->nthValue(1), 0);
@@ -702,17 +702,17 @@ public:
TS_ASSERT(splitter1);
TS_ASSERT_EQUALS(splitter1->size(), 3);
- TS_ASSERT_EQUALS(splitter1->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter1->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter1->nthValue(0), 0);
TS_ASSERT_EQUALS(
splitter1->nthTime(1).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter1->nthValue(1), 1);
TS_ASSERT_EQUALS(
splitter1->nthTime(2).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter1->nthValue(2), 0);
@@ -733,17 +733,17 @@ public:
TS_ASSERT(splitter2);
TS_ASSERT_EQUALS(splitter2->size(), 7);
- TS_ASSERT_EQUALS(splitter2->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter2->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter2->nthValue(0), 0);
TS_ASSERT_EQUALS(
splitter2->nthTime(1).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter2->nthValue(1), 1);
TS_ASSERT_EQUALS(
splitter2->nthTime(2).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(2.65e+08)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(2.65e+08)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter2->nthValue(2), 0);
@@ -872,11 +872,11 @@ public:
filteredws0->run().getProperty("splitter"));
TS_ASSERT(splitter0);
TS_ASSERT_EQUALS(splitter0->size(), 2);
- TS_ASSERT_EQUALS(splitter0->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter0->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter0->nthValue(0), 1);
TS_ASSERT_EQUALS(
splitter0->nthTime(1).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter0->nthValue(1), 0);
@@ -895,17 +895,17 @@ public:
TS_ASSERT(splitter1);
TS_ASSERT_EQUALS(splitter1->size(), 3);
- TS_ASSERT_EQUALS(splitter1->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter1->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter1->nthValue(0), 0);
TS_ASSERT_EQUALS(
splitter1->nthTime(1).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(3.5e+07)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter1->nthValue(1), 1);
TS_ASSERT_EQUALS(
splitter1->nthTime(2).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter1->nthValue(2), 0);
@@ -924,17 +924,17 @@ public:
TS_ASSERT(splitter2);
TS_ASSERT_EQUALS(splitter2->size(), 7);
- TS_ASSERT_EQUALS(splitter2->nthTime(0), Kernel::DateAndTime(runstart_i64));
+ TS_ASSERT_EQUALS(splitter2->nthTime(0), Mantid::Types::DateAndTime(runstart_i64));
TS_ASSERT_EQUALS(splitter2->nthValue(0), 0);
TS_ASSERT_EQUALS(
splitter2->nthTime(1).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(1.95e+08)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter2->nthValue(1), 1);
TS_ASSERT_EQUALS(
splitter2->nthTime(2).totalNanoseconds(),
- Kernel::DateAndTime(static_cast<int>(2.65e+08)).totalNanoseconds() +
+ Mantid::Types::DateAndTime(static_cast<int>(2.65e+08)).totalNanoseconds() +
runstart_i64);
TS_ASSERT_EQUALS(splitter2->nthValue(2), 0);
@@ -1138,7 +1138,7 @@ public:
WorkspaceCreationHelper::createEventWorkspaceWithFullInstrument(10, 1,
true);
- Kernel::DateAndTime runstart(runstart_i64);
+ Mantid::Types::DateAndTime runstart(runstart_i64);
eventWS->mutableRun().addProperty("run_start", runstart.toISO8601String(),
true);
@@ -1152,7 +1152,7 @@ public:
for (int64_t pid = 0; pid < static_cast<int64_t>(numpulses); pid++) {
int64_t pulsetime_i64 = pid * pulsedt + runstart.totalNanoseconds();
- Kernel::DateAndTime pulsetime(pulsetime_i64);
+ Mantid::Types::DateAndTime pulsetime(pulsetime_i64);
// add pulse time to proton charge log once and only once
if (i == 0) {
@@ -1188,7 +1188,7 @@ public:
Kernel::make_unique<Kernel::TimeSeriesProperty<int>>("slow_int_log");
int_tsp->setUnits("meter");
for (size_t i = 0; i < 10; ++i) {
- Kernel::DateAndTime log_time(runstart_i64 + 5 * pulsedt * i);
+ Mantid::Types::DateAndTime log_time(runstart_i64 + 5 * pulsedt * i);
int log_value = static_cast<int>(i + 1) * 20;
int_tsp->addValue(log_time, log_value);
}
@@ -1218,7 +1218,7 @@ public:
const auto &spectrumInfo = eventWS->spectrumInfo();
double l1 = spectrumInfo.l1();
- Kernel::DateAndTime runstart(runstart_i64);
+ Mantid::Types::DateAndTime runstart(runstart_i64);
EventList fakeevlist = fake_uniform_time_sns_data(runstart_i64, pulsedt);
@@ -1312,7 +1312,7 @@ public:
WorkspaceCreationHelper::createEventWorkspaceWithFullInstrument(10, 1,
true);
- Kernel::DateAndTime runstart(runstart_i64);
+ Mantid::Types::DateAndTime runstart(runstart_i64);
// Create 1000 events
EventList fakeevlist = fake_uniform_time_sns_data(runstart_i64, pulsedt);
@@ -1593,7 +1593,7 @@ public:
for (int time = 0; time < 1000; time++) {
// All pulse times from 0 to 999 in seconds
- Kernel::DateAndTime pulsetime(
+ Mantid::Types::DateAndTime pulsetime(
static_cast<int64_t>(time * pulselength + runstart));
double tof = static_cast<double>(g1() % 1000);
el += TofEvent(tof, pulsetime);
diff --git a/Framework/Algorithms/test/FindDetectorsOutsideLimitsTest.h b/Framework/Algorithms/test/FindDetectorsOutsideLimitsTest.h
index 60adff74c2bff668766af0a4c5462139e3d4e48b..0de4204c13a88443d5c0ac69425e834dbbe38cdf 100644
--- a/Framework/Algorithms/test/FindDetectorsOutsideLimitsTest.h
+++ b/Framework/Algorithms/test/FindDetectorsOutsideLimitsTest.h
@@ -9,6 +9,7 @@
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -17,8 +18,9 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
-using Mantid::HistogramData::Counts;
+using namespace Mantid::Types;
using Mantid::HistogramData::CountStandardDeviations;
+using Mantid::HistogramData::Counts;
class FindDetectorsOutsideLimitsTest : public CxxTest::TestSuite {
public:
@@ -159,11 +161,12 @@ public:
Instrument_sptr inst =
ComponentCreationHelper::createTestInstrumentCylindrical(10);
work_in->setInstrument(inst);
- DateAndTime run_start("2010-01-01T00:00:00");
+ DateAndTime run_start =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
// Add ten more at #10 so that it fails
for (int i = 0; i < 10; i++)
- work_in->getSpectrum(10)
- .addEventQuickly(TofEvent((i + 0.5), run_start + double(i)));
+ work_in->getSpectrum(10).addEventQuickly(
+ TofEvent((i + 0.5), run_start + double(i)));
AnalysisDataService::Instance().add("testdead_in", work_in);
diff --git a/Framework/Algorithms/test/GenerateEventsFilterTest.h b/Framework/Algorithms/test/GenerateEventsFilterTest.h
index 5d3422b8c96c81e5f42f0ebbec0e3a0823c7b1cf..3d6f4fba570890c91b383c91cb3bbaf402d1cd36 100644
--- a/Framework/Algorithms/test/GenerateEventsFilterTest.h
+++ b/Framework/Algorithms/test/GenerateEventsFilterTest.h
@@ -1,38 +1,40 @@
#ifndef MANTID_ALGORITHMS_GENERATEEVENTSFILTERTEST_H_
#define MANTID_ALGORITHMS_GENERATEEVENTSFILTERTEST_H_
-#include <cxxtest/TestSuite.h>
-#include <cmath>
#include <Poco/File.h>
+#include <cmath>
+#include <cxxtest/TestSuite.h>
+#include "MantidAPI/TableRow.h"
#include "MantidAlgorithms/GenerateEventsFilter.h"
+#include "MantidDataHandling/LoadInstrument.h"
+#include "MantidDataObjects/EventList.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/SplittersWorkspace.h"
-#include "MantidKernel/TimeSplitter.h"
#include "MantidDataObjects/TableWorkspace.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidAPI/TableRow.h"
-#include "MantidDataObjects/EventList.h"
-#include "MantidDataHandling/LoadInstrument.h"
+#include "MantidKernel/TimeSplitter.h"
#include "MantidKernel/UnitFactory.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
using namespace Mantid;
using namespace Mantid::Algorithms;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
using namespace std;
namespace {
//----------------------------------------------------------------------------------------------
/** Create an EventWorkspace containing an integer log
-* 1. Run start = 10 (s)
-* 2. Run end = 22 (s)
-* 3. Pulse = 0.5 (s)
-* 4. Log change = 1 (s)
-*/
+ * 1. Run start = 10 (s)
+ * 2. Run end = 22 (s)
+ * 3. Pulse = 0.5 (s)
+ * 4. Log change = 1 (s)
+ */
EventWorkspace_sptr createEventWorkspaceIntLog() {
using namespace WorkspaceCreationHelper;
@@ -48,10 +50,10 @@ EventWorkspace_sptr createEventWorkspaceIntLog() {
int64_t pulsetime_ns = 5 * factor / 10;
int64_t logduration_ns = 1 * factor;
- Kernel::DateAndTime runstarttime(runstarttime_ns);
+ Mantid::Types::DateAndTime runstarttime(runstarttime_ns);
eventws->mutableRun().addProperty("run_start",
runstarttime.toISO8601String());
- Kernel::DateAndTime runendtime(runstoptime_ns);
+ Mantid::Types::DateAndTime runendtime(runstoptime_ns);
eventws->mutableRun().addProperty("run_end", runendtime.toISO8601String());
// 3. Proton charge log
@@ -59,7 +61,7 @@ EventWorkspace_sptr createEventWorkspaceIntLog() {
new Kernel::TimeSeriesProperty<double>("proton_charge");
int64_t curtime_ns = runstarttime_ns;
while (curtime_ns <= runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
protonchargelog->addValue(curtime, 1.0);
curtime_ns += pulsetime_ns;
}
@@ -74,7 +76,7 @@ EventWorkspace_sptr createEventWorkspaceIntLog() {
// double period = static_cast<double>(pulsetime_ns);
curtime_ns = runstarttime_ns;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
dummyintlog->addValue(curtime, logvalue);
curtime_ns += logduration_ns;
@@ -84,7 +86,7 @@ EventWorkspace_sptr createEventWorkspaceIntLog() {
return eventws;
}
-}
+} // namespace
class GenerateEventsFilterTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
@@ -139,7 +141,7 @@ public:
TS_ASSERT_EQUALS(splittersws->getNumberSplitters(), 1);
Kernel::SplittingInterval splitter0 = splittersws->getSplitter(0);
- Kernel::DateAndTime runstart(3000000000);
+ Mantid::Types::DateAndTime runstart(3000000000);
TS_ASSERT_EQUALS(splitter0.start().totalNanoseconds(),
runstart.totalNanoseconds() + 100);
TS_ASSERT_EQUALS(splitter0.stop().totalNanoseconds(),
@@ -199,13 +201,14 @@ public:
std::string runstarttimestr =
eventWS->run().getProperty("run_start")->value();
- Kernel::DateAndTime runstarttime(runstarttimestr);
+ DateAndTime runstarttime =
+ DateAndTimeHelpers::createFromISO8601(runstarttimestr);
int64_t runstarttime_ns = runstarttime.totalNanoseconds();
Kernel::TimeSeriesProperty<double> *protonchargelog =
dynamic_cast<Kernel::TimeSeriesProperty<double> *>(
eventWS->run().getProperty("proton_charge"));
- Kernel::DateAndTime runstoptime = Kernel::DateAndTime(
+ Mantid::Types::DateAndTime runstoptime = Mantid::Types::DateAndTime(
protonchargelog->lastTime().totalNanoseconds() + 100000);
// b) First interval
@@ -223,8 +226,8 @@ public:
// d) Randomly
Kernel::SplittingInterval splitterR = splittersws->getSplitter(40);
- Kernel::DateAndTime t0 = splitterR.start();
- Kernel::DateAndTime tf = splitterR.stop();
+ Mantid::Types::DateAndTime t0 = splitterR.start();
+ Mantid::Types::DateAndTime tf = splitterR.stop();
int64_t dt_ns = tf.totalNanoseconds() - t0.totalNanoseconds();
TS_ASSERT_EQUALS(dt_ns, timeinterval_ns);
int64_t dt_runtimestart = t0.totalNanoseconds() - runstarttime_ns;
@@ -361,7 +364,7 @@ public:
//----------------------------------------------------------------------------------------------
/** Test to generate a set of filters against an integer log
- */
+ */
void test_genFilterByIntegerLog() {
// 1. Create input
DataObjects::EventWorkspace_sptr eventWS = createEventWorkspaceIntLog();
@@ -432,7 +435,7 @@ public:
//----------------------------------------------------------------------------------------------
/** Test to generate a set of filters against an integer log by using the
* single value mode
- */
+ */
void test_genFilterByIntegerLog2() {
// Create input
DataObjects::EventWorkspace_sptr eventWS = createEventWorkspaceIntLog();
@@ -511,7 +514,7 @@ public:
int64_t runstoptime_ns = 3001000000;
int64_t pulsetime_ns = 100000;
- Kernel::DateAndTime runstarttime(runstarttime_ns);
+ Mantid::Types::DateAndTime runstarttime(runstarttime_ns);
eventws->mutableRun().addProperty("run_start",
runstarttime.toISO8601String());
@@ -520,7 +523,7 @@ public:
new Kernel::TimeSeriesProperty<double>("proton_charge");
int64_t curtime_ns = runstarttime_ns;
while (curtime_ns <= runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
protonchargelog->addValue(curtime, 1.0);
curtime_ns += pulsetime_ns;
}
@@ -534,7 +537,7 @@ public:
double period = static_cast<double>(pulsetime_ns);
curtime_ns = runstarttime_ns;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
double value =
sin(M_PI * static_cast<double>(curtime_ns) / period * 0.25);
sinlog->addValue(curtime, value);
@@ -548,7 +551,7 @@ public:
period = static_cast<double>(pulsetime_ns * 10);
curtime_ns = runstarttime_ns;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
double value = sin(2 * M_PI * static_cast<double>(curtime_ns) / period);
coslog->addValue(curtime, value);
curtime_ns += pulsetime_ns * 2;
@@ -599,7 +602,7 @@ public:
TS_ASSERT_EQUALS(splittersws->x(0).size(), 2);
TS_ASSERT_EQUALS(splittersws->y(0).size(), 1);
- Kernel::DateAndTime runstart(3000000000);
+ Mantid::Types::DateAndTime runstart(3000000000);
TS_ASSERT_EQUALS(static_cast<int64_t>(splittersws->x(0)[0] * 1.E9),
runstart.totalNanoseconds() + 100);
TS_ASSERT_EQUALS(static_cast<int64_t>(splittersws->x(0)[1] * 1.E9),
@@ -658,14 +661,15 @@ public:
std::string runstarttimestr =
eventWS->run().getProperty("run_start")->value();
- Kernel::DateAndTime runstarttime(runstarttimestr);
+ DateAndTime runstarttime =
+ DateAndTimeHelpers::createFromISO8601(runstarttimestr);
int64_t runstarttime_ns = runstarttime.totalNanoseconds();
Kernel::TimeSeriesProperty<double> *protonchargelog =
dynamic_cast<Kernel::TimeSeriesProperty<double> *>(
eventWS->run().getProperty("proton_charge"));
- Kernel::DateAndTime runstoptime = Kernel::DateAndTime(
- protonchargelog->lastTime().totalNanoseconds() + 100000);
+ DateAndTime runstoptime =
+ DateAndTime(protonchargelog->lastTime().totalNanoseconds() + 100000);
// First interval
TS_ASSERT_EQUALS(static_cast<int64_t>(splittersws->x(0)[0] * 1.E9),
@@ -683,8 +687,8 @@ public:
/* d) Randomly
Kernel::SplittingInterval splitterR = splittersws->getSplitter(40);
- Kernel::DateAndTime t0 = splitterR.start();
- Kernel::DateAndTime tf = splitterR.stop();
+ Mantid::Types::DateAndTime t0 = splitterR.start();
+ Mantid::Types::DateAndTime tf = splitterR.stop();
int64_t dt_ns = tf.totalNanoseconds()-t0.totalNanoseconds();
TS_ASSERT_EQUALS(dt_ns, timeinterval_ns);
int64_t dt_runtimestart = t0.totalNanoseconds()-runstarttime_ns;
@@ -1065,13 +1069,14 @@ public:
std::string runstarttimestr =
eventWS->run().getProperty("run_start")->value();
- Kernel::DateAndTime runstarttime(runstarttimestr);
+ DateAndTime runstarttime =
+ DateAndTimeHelpers::createFromISO8601(runstarttimestr);
int64_t runstarttime_ns = runstarttime.totalNanoseconds();
Kernel::TimeSeriesProperty<double> *protonchargelog =
dynamic_cast<Kernel::TimeSeriesProperty<double> *>(
eventWS->run().getProperty("proton_charge"));
- Kernel::DateAndTime runstoptime = Kernel::DateAndTime(
+ Mantid::Types::DateAndTime runstoptime = Mantid::Types::DateAndTime(
protonchargelog->lastTime().totalNanoseconds() + 100000);
// First 3 intervals
@@ -1105,7 +1110,7 @@ public:
//----------------------------------------------------------------------------------------------
/** Test that time intervals consisting solely of zero-values throws
- */
+ */
void test_timeIntervalsOnlyZeroValuesThrows() {
// Create input Workspace & initial setup
DataObjects::EventWorkspace_sptr eventWS = createEventWorkspace();
@@ -1138,7 +1143,7 @@ public:
//----------------------------------------------------------------------------------------------
/** Convert the splitters stored in a matrix workspace to a vector of
* SplittingInterval objects
- */
+ */
size_t convertMatrixSplitterToSplitters(
API::MatrixWorkspace_const_sptr matrixws,
std::vector<Kernel::SplittingInterval> &splitters) {
@@ -1150,8 +1155,9 @@ public:
for (size_t i = 0; i < vecY.size(); ++i) {
if (vecY[i] >= -0.0) {
// A valid time interval for Splitters
- Kernel::DateAndTime tstart(static_cast<int64_t>(vecX[i] * 1.E9));
- Kernel::DateAndTime tstop(static_cast<int64_t>(vecX[i + 1] * 1.E9));
+ Mantid::Types::DateAndTime tstart(static_cast<int64_t>(vecX[i] * 1.E9));
+ Mantid::Types::DateAndTime tstop(
+ static_cast<int64_t>(vecX[i + 1] * 1.E9));
int wsindex = static_cast<int>(vecY[i]);
Kernel::SplittingInterval ti(tstart, tstop, wsindex);
diff --git a/Framework/Algorithms/test/GetAllEiTest.h b/Framework/Algorithms/test/GetAllEiTest.h
index 0693b03e9d25f4dc3fe59f8a49ce418928d563bb..a157112b9c7a4fadb7d5e0102fece198cdf69451 100644
--- a/Framework/Algorithms/test/GetAllEiTest.h
+++ b/Framework/Algorithms/test/GetAllEiTest.h
@@ -92,7 +92,7 @@ DataObjects::Workspace2D_sptr createTestingWS(bool noLogs = false) {
Kernel::make_unique<Kernel::TimeSeriesProperty<double>>("is_running");
for (int i = 0; i < 10; i++) {
- auto time = Kernel::DateAndTime(10 * i, 0);
+ auto time = Mantid::Types::DateAndTime(10 * i, 0);
chopDelayLog->addValue(time, delay);
chopSpeedLog->addValue(time, chopSpeed);
isRunning->addValue(time, 1.);
@@ -238,13 +238,13 @@ public:
auto chopSpeed = Kernel::make_unique<Kernel::TimeSeriesProperty<double>>(
"Chopper_Speed");
for (int i = 0; i < 10; i++) {
- chopSpeed->addValue(Kernel::DateAndTime(10000 + 10 * i, 0), 1.);
+ chopSpeed->addValue(Mantid::Types::DateAndTime(10000 + 10 * i, 0), 1.);
}
for (int i = 0; i < 10; i++) {
- chopSpeed->addValue(Kernel::DateAndTime(100 + 10 * i, 0), 10.);
+ chopSpeed->addValue(Mantid::Types::DateAndTime(100 + 10 * i, 0), 10.);
}
for (int i = 0; i < 10; i++) {
- chopSpeed->addValue(Kernel::DateAndTime(10 * i, 0), 100.);
+ chopSpeed->addValue(Mantid::Types::DateAndTime(10 * i, 0), 100.);
}
ws->mutableRun().addLogData(chopSpeed.release());
@@ -253,13 +253,13 @@ public:
"Attempt to get log without start/stop time set should fail",
m_getAllEi.getAvrgLogValue(ws, "ChopperSpeedLog"), std::runtime_error);
- ws->mutableRun().setStartAndEndTime(Kernel::DateAndTime(90, 0),
- Kernel::DateAndTime(10000, 0));
+ ws->mutableRun().setStartAndEndTime(Mantid::Types::DateAndTime(90, 0),
+ Mantid::Types::DateAndTime(10000, 0));
double val = m_getAllEi.getAvrgLogValue(ws, "ChopperSpeedLog");
TS_ASSERT_DELTA(val, (10 * 10 + 100.) / 11., 1.e-6);
- ws->mutableRun().setStartAndEndTime(Kernel::DateAndTime(100, 0),
- Kernel::DateAndTime(10000, 0));
+ ws->mutableRun().setStartAndEndTime(Mantid::Types::DateAndTime(100, 0),
+ Mantid::Types::DateAndTime(10000, 0));
val = m_getAllEi.getAvrgLogValue(ws, "ChopperSpeedLog");
TS_ASSERT_DELTA(val, 10., 1.e-6);
@@ -270,7 +270,7 @@ public:
"proton_charge");
for (int i = 0; i < 10; i++) {
- auto time = Kernel::DateAndTime(200 + 10 * i, 0);
+ auto time = Mantid::Types::DateAndTime(200 + 10 * i, 0);
chopDelay->addValue(time, 10.);
if (i < 2) {
goodFram->addValue(time, 1);
@@ -279,12 +279,12 @@ public:
}
}
for (int i = 0; i < 10; i++) {
- auto time = Kernel::DateAndTime(100 + 10 * i, 0);
+ auto time = Mantid::Types::DateAndTime(100 + 10 * i, 0);
chopDelay->addValue(time, 0.1);
goodFram->addValue(time, 1);
}
for (int i = 0; i < 10; i++) {
- auto time = Kernel::DateAndTime(10 * i, 0);
+ auto time = Mantid::Types::DateAndTime(10 * i, 0);
chopDelay->addValue(time, 1.);
goodFram->addValue(time, 0);
}
@@ -304,7 +304,7 @@ public:
goodFram = Kernel::make_unique<Kernel::TimeSeriesProperty<double>>(
"proton_charge");
for (int i = 0; i < 10; i++) {
- auto time = Kernel::DateAndTime(100 + 10 * i, 0);
+ auto time = Mantid::Types::DateAndTime(100 + 10 * i, 0);
goodFram->addValue(time, 1);
}
@@ -340,7 +340,7 @@ public:
double gf(0);
for (int i = 0; i < 50; i++) {
- auto time = Kernel::DateAndTime(10 * i, 0);
+ auto time = Mantid::Types::DateAndTime(10 * i, 0);
if (i > 10 && i < 20) {
chopDelay->addValue(time, 100.);
chopSpeed->addValue(time, 0.);
diff --git a/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h b/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h
index b93b6aa1d81204d74dd4a520f6fd244f57506993..e600725d7254a7703199db263c4ba018c5efa7a2 100644
--- a/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h
+++ b/Framework/Algorithms/test/GetTimeSeriesLogInformationTest.h
@@ -36,8 +36,8 @@ DataObjects::EventWorkspace_sptr createEventWorkspace() {
int64_t runstoptime_ns = 3001000000;
int64_t pulsetime_ns = 100000;
- Kernel::DateAndTime runstarttime(runstarttime_ns);
- Kernel::DateAndTime runendtime(runstoptime_ns);
+ Mantid::Types::DateAndTime runstarttime(runstarttime_ns);
+ Mantid::Types::DateAndTime runendtime(runstoptime_ns);
eventws->mutableRun().addProperty("run_start",
runstarttime.toISO8601String());
eventws->mutableRun().addProperty("run_end", runendtime.toISO8601String());
@@ -47,7 +47,7 @@ DataObjects::EventWorkspace_sptr createEventWorkspace() {
new Kernel::TimeSeriesProperty<double>("proton_charge");
int64_t curtime_ns = runstarttime_ns;
while (curtime_ns <= runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
protonchargelog->addValue(curtime, 1.0);
curtime_ns += pulsetime_ns;
}
@@ -59,7 +59,7 @@ DataObjects::EventWorkspace_sptr createEventWorkspace() {
double period = static_cast<double>(pulsetime_ns);
curtime_ns = runstarttime_ns;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
double value = sin(M_PI * static_cast<double>(curtime_ns) / period * 0.25);
sinlog->addValue(curtime, value);
curtime_ns += pulsetime_ns / 4;
@@ -72,7 +72,7 @@ DataObjects::EventWorkspace_sptr createEventWorkspace() {
period = static_cast<double>(pulsetime_ns * 10);
curtime_ns = runstarttime_ns;
while (curtime_ns < runstoptime_ns) {
- Kernel::DateAndTime curtime(curtime_ns);
+ Mantid::Types::DateAndTime curtime(curtime_ns);
double value = sin(2 * M_PI * static_cast<double>(curtime_ns) / period);
coslog->addValue(curtime, value);
curtime_ns += pulsetime_ns * 2;
diff --git a/Framework/Algorithms/test/NormaliseByCurrentTest.h b/Framework/Algorithms/test/NormaliseByCurrentTest.h
index aa66b5ada0f28833f7b78c4052a781adb8530186..822f7dc015d1bba4a2129bd712013f9200c393a9 100644
--- a/Framework/Algorithms/test/NormaliseByCurrentTest.h
+++ b/Framework/Algorithms/test/NormaliseByCurrentTest.h
@@ -118,14 +118,14 @@ void addPChargeLogTo(MatrixWorkspace_sptr ws, const double pChargeAccum) {
auto pchargeLog =
Kernel::make_unique<Kernel::TimeSeriesProperty<double>>("proton_charge");
- const Kernel::DateAndTime runstart(20000000000);
+ const Mantid::Types::DateAndTime runstart(20000000000);
const int64_t pulsedt = 100 * 1000 * 1000;
const size_t numpulses = 100;
const double pCharge = pChargeAccum / static_cast<double>(numpulses);
for (int64_t pid = 0; pid < static_cast<int64_t>(numpulses); pid++) {
const int64_t pulsetime_i64 = pulsedt + runstart.totalNanoseconds();
- const Kernel::DateAndTime pulsetime(pulsetime_i64);
+ const Mantid::Types::DateAndTime pulsetime(pulsetime_i64);
pchargeLog->addValue(pulsetime, pCharge);
} // FOR each pulse
diff --git a/Framework/Algorithms/test/RebinByTimeBaseTest.h b/Framework/Algorithms/test/RebinByTimeBaseTest.h
index 1b67a58ec840c9a3f421d5d2d4d58118eaaecf6b..3db670f5791567f2056cb62cee9226b00aff6451 100644
--- a/Framework/Algorithms/test/RebinByTimeBaseTest.h
+++ b/Framework/Algorithms/test/RebinByTimeBaseTest.h
@@ -13,7 +13,7 @@
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Events.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Unit.h"
#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -24,6 +24,7 @@ using namespace Mantid::Algorithms;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
+using Mantid::Types::DateAndTime;
namespace {
/**
diff --git a/Framework/Algorithms/test/SANSCollimationLengthEstimatorTest.h b/Framework/Algorithms/test/SANSCollimationLengthEstimatorTest.h
index 6be6c9e16041371f99fc505b0386a09da35c18e9..63dab68fabeeb8ba460af88e1d2e96841665f8c9 100644
--- a/Framework/Algorithms/test/SANSCollimationLengthEstimatorTest.h
+++ b/Framework/Algorithms/test/SANSCollimationLengthEstimatorTest.h
@@ -1,18 +1,20 @@
#ifndef MANTID_ALGORITHMS_SANSCOLLIMATIONLENGTHESTIMATORTEST_H
#define MANTID_ALGORITHMS_SANSCOLLIMATIONLENGTHESTIMATORTEST_H
-#include <cxxtest/TestSuite.h>
-#include "MantidAlgorithms/SANSCollimationLengthEstimator.h"
#include "MantidAlgorithms/AddSampleLog.h"
+#include "MantidAlgorithms/SANSCollimationLengthEstimator.h"
+#include <cxxtest/TestSuite.h>
-#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/LogFilter.h"
+#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidTypes/DateAndTime.h"
using namespace Mantid::Algorithms;
+using namespace Mantid::Types;
using Mantid::Kernel::V3D;
using namespace Mantid::Geometry;
@@ -105,7 +107,8 @@ void addSampleLog(Mantid::API::MatrixWorkspace_sptr workspace,
unsigned int length) {
auto timeSeries =
new Mantid::Kernel::TimeSeriesProperty<double>(sampleLogName);
- Mantid::Kernel::DateAndTime startTime("2010-01-01T00:10:00");
+ DateAndTime startTime =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:10:00");
timeSeries->setUnits("mm");
for (unsigned int i = 0; i < length; i++) {
timeSeries->addValue(startTime + static_cast<double>(i), value);
@@ -159,7 +162,7 @@ Mantid::API::MatrixWorkspace_sptr createTestWorkspace(
}
return ws2d;
}
-}
+} // namespace
class SANSCollimationLengthEstimatorTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/Algorithms/test/ShiftLogTimeTest.h b/Framework/Algorithms/test/ShiftLogTimeTest.h
index 658605e2810f4a1df71eacea3bf331e5dd60d610..b31837bc464e46a93eb43b888ebb9e3f54a39c78 100644
--- a/Framework/Algorithms/test/ShiftLogTimeTest.h
+++ b/Framework/Algorithms/test/ShiftLogTimeTest.h
@@ -1,20 +1,22 @@
#ifndef MANTID_ALGORITHMS_SHIFTLOGTIMETEST_H_
#define MANTID_ALGORITHMS_SHIFTLOGTIMETEST_H_
-#include <cxxtest/TestSuite.h>
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/Run.h"
#include "MantidAlgorithms/ShiftLogTime.h"
#include "MantidDataObjects/Workspace2D.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/System.h"
-#include "MantidKernel/Timer.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/Run.h"
+#include "MantidKernel/Timer.h"
+#include <cxxtest/TestSuite.h>
using namespace Mantid;
using namespace Mantid::Algorithms;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class ShiftLogTimeTest : public CxxTest::TestSuite {
public:
@@ -58,7 +60,7 @@ private:
*/
void verify(const std::string in_name, const std::string out_name,
const int shift) {
- DateAndTime start(start_str);
+ DateAndTime start = DateAndTimeHelpers::createFromISO8601(start_str);
// create a workspace to mess with
Workspace2D_sptr testWorkspace(new Workspace2D);
diff --git a/Framework/Algorithms/test/SumEventsByLogValueTest.h b/Framework/Algorithms/test/SumEventsByLogValueTest.h
index c0fad83aa1fcb1e8efb04e04ba3e740dd710372d..2c407cf851d7455a7b8c0ffc9788bf9e1cae219e 100644
--- a/Framework/Algorithms/test/SumEventsByLogValueTest.h
+++ b/Framework/Algorithms/test/SumEventsByLogValueTest.h
@@ -4,6 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidAlgorithms/SumEventsByLogValue.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -11,6 +12,7 @@ using Mantid::Algorithms::SumEventsByLogValue;
using Mantid::DataObjects::EventWorkspace_sptr;
using namespace Mantid::API;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class SumEventsByLogValueTest : public CxxTest::TestSuite {
public:
@@ -148,7 +150,8 @@ private:
WorkspaceCreationHelper::createEventWorkspace(3, 1);
Run &run = ws->mutableRun();
- DateAndTime run_start("2010-01-01T00:00:00");
+ DateAndTime run_start =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
auto dblTSP = new TimeSeriesProperty<double>("doubleProp");
dblTSP->addValue(run_start, 3.0);
@@ -191,7 +194,8 @@ public:
std::vector<DateAndTime> times;
std::vector<int> index;
std::vector<double> dbl1, dbl2;
- DateAndTime startTime("2010-01-01T00:00:00");
+ DateAndTime startTime =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
for (int i = 0; i < 100; ++i) {
times.push_back(startTime + i * 10.0);
index.push_back(i);
diff --git a/Framework/Algorithms/test/TOFSANSResolutionByPixelTest.h b/Framework/Algorithms/test/TOFSANSResolutionByPixelTest.h
index 65a5fe6bb7c7f6cf1dc03fbabefa32782925cc4b..894389383885b486dc9fb0a9358a1b23f70d7d3e 100644
--- a/Framework/Algorithms/test/TOFSANSResolutionByPixelTest.h
+++ b/Framework/Algorithms/test/TOFSANSResolutionByPixelTest.h
@@ -1,18 +1,19 @@
#ifndef TOFSANSRESOLUTIONBYPIXELTEST_H_
#define TOFSANSRESOLUTIONBYPIXELTEST_H_
-#include <cxxtest/TestSuite.h>
-#include "MantidAlgorithms/TOFSANSResolutionByPixel.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/Axis.h"
#include "MantidAPI/DataProcessorAlgorithm.h"
#include "MantidAPI/IAlgorithm.h"
#include "MantidAPI/Workspace.h"
+#include "MantidAlgorithms/TOFSANSResolutionByPixel.h"
#include "MantidDataObjects/Workspace2D.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidGeometry/Objects/ShapeFactory.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include <cxxtest/TestSuite.h>
#include "boost/shared_ptr.hpp"
#include <stdexcept>
@@ -116,7 +117,9 @@ void addSampleLog(Mantid::API::MatrixWorkspace_sptr workspace,
unsigned int length) {
auto timeSeries =
new Mantid::Kernel::TimeSeriesProperty<double>(sampleLogName);
- Mantid::Kernel::DateAndTime startTime("2010-01-01T00:10:00");
+ Mantid::Types::DateAndTime startTime =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2010-01-01T00:10:00");
timeSeries->setUnits("mm");
for (unsigned int i = 0; i < length; i++) {
timeSeries->addValue(startTime + static_cast<double>(i), value);
@@ -180,7 +183,7 @@ Mantid::API::MatrixWorkspace_sptr createTestWorkspace(
}
return ws2d;
}
-}
+} // namespace
class TOFSANSResolutionByPixelTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/Beamline/src/DetectorInfo.cpp b/Framework/Beamline/src/DetectorInfo.cpp
index e43da35175367387c38dc28c34f2e03b83c7d5ff..b60d9ce6e56cc6a0e8ab205a44d6f5b65729de76 100644
--- a/Framework/Beamline/src/DetectorInfo.cpp
+++ b/Framework/Beamline/src/DetectorInfo.cpp
@@ -159,7 +159,7 @@ size_t DetectorInfo::scanCount(const size_t index) const {
/** Returns the scan interval of the detector with given index.
*
* The interval start and end values would typically correspond to nanoseconds
- * since 1990, as in Kernel::DateAndTime. */
+ * since 1990, as in Mantid::Types::DateAndTime. */
std::pair<int64_t, int64_t>
DetectorInfo::scanInterval(const std::pair<size_t, size_t> &index) const {
if (!m_scanIntervals)
@@ -180,7 +180,7 @@ void checkScanInterval(const std::pair<int64_t, int64_t> &interval) {
/** Set the scan interval of the detector with given detector index.
*
* The interval start and end values would typically correspond to nanoseconds
- * since 1990, as in Kernel::DateAndTime. Note that it is currently not possible
+ * since 1990, as in Mantid::Types::DateAndTime. Note that it is currently not possible
* to modify scan intervals for a DetectorInfo with time-dependent detectors,
* i.e., time intervals must be set with this method before merging individual
* scans. */
diff --git a/Framework/CMakeLists.txt b/Framework/CMakeLists.txt
index 4c6af67e0619e58c1b505b343217a7ae8a586fa2..b565600deab1d80485a135ddaa0dfdaa36e05bf0 100644
--- a/Framework/CMakeLists.txt
+++ b/Framework/CMakeLists.txt
@@ -70,6 +70,7 @@ add_dependencies ( check FrameworkTests )
include_directories (Types/inc)
add_subdirectory (Types)
+set ( MANTIDLIBS ${MANTIDLIBS} Types )
include_directories (Kernel/inc)
add_subdirectory (Kernel)
@@ -86,6 +87,7 @@ add_subdirectory (Indexing)
include_directories (Beamline/inc)
add_subdirectory (Beamline)
+
set ( MANTIDLIBS ${MANTIDLIBS} Parallel )
# HistogramData has header-only dependency on Kernel, so Kernel comes after.
set ( MANTIDLIBS ${MANTIDLIBS} HistogramData )
diff --git a/Framework/Crystal/src/LoadIsawPeaks.cpp b/Framework/Crystal/src/LoadIsawPeaks.cpp
index 9d8e25c7083b870b32290495f347a36b599df0bd..3995de9a715a77c0cb47eda958a01de4b8748082 100644
--- a/Framework/Crystal/src/LoadIsawPeaks.cpp
+++ b/Framework/Crystal/src/LoadIsawPeaks.cpp
@@ -70,7 +70,7 @@ int LoadIsawPeaks::confidence(Kernel::FileDescriptor &descriptor) const {
throw std::logic_error(std::string("No Instrument for Peaks file"));
// Date: use the current date/time if not found
- Kernel::DateAndTime C_experimentDate;
+ Mantid::Types::DateAndTime C_experimentDate;
tag = getWord(in, false);
if (tag == "Date:")
getWord(in, false);
@@ -147,11 +147,11 @@ std::string LoadIsawPeaks::readHeader(PeaksWorkspace_sptr outWS,
throw std::logic_error(std::string("No Instrument for Peaks file"));
// Date: use the current date/time if not found
- Kernel::DateAndTime C_experimentDate;
+ Mantid::Types::DateAndTime C_experimentDate;
std::string date;
tag = getWord(in, false);
if (tag.empty())
- date = Kernel::DateAndTime::getCurrentTime().toISO8601String();
+ date = Mantid::Types::DateAndTime::getCurrentTime().toISO8601String();
else if (tag == "Date:")
date = getWord(in, false);
readToEndOfLine(in, true);
diff --git a/Framework/Crystal/src/SaveIsawPeaks.cpp b/Framework/Crystal/src/SaveIsawPeaks.cpp
index 6a0a9088b2e1aabcbd663072256fcaba4b2de49a..56a40a4f496f2b754fe0a189ba96a4c213d9b576 100644
--- a/Framework/Crystal/src/SaveIsawPeaks.cpp
+++ b/Framework/Crystal/src/SaveIsawPeaks.cpp
@@ -151,7 +151,7 @@ void SaveIsawPeaks::exec() {
// TODO: The experiment date might be more useful than the instrument date.
// For now, this allows the proper instrument to be loaded back after
// saving.
- Kernel::DateAndTime expDate = inst->getValidFromDate() + 1.0;
+ Mantid::Types::DateAndTime expDate = inst->getValidFromDate() + 1.0;
out << expDate.toISO8601String() << '\n';
out << "6 L1 T0_SHIFT\n";
diff --git a/Framework/Crystal/src/SetGoniometer.cpp b/Framework/Crystal/src/SetGoniometer.cpp
index 8929d6ce1a7232f6a2fc376968fef870cc28f10b..1d832290fab000f362b58b08a044ee629c7d8361 100644
--- a/Framework/Crystal/src/SetGoniometer.cpp
+++ b/Framework/Crystal/src/SetGoniometer.cpp
@@ -88,7 +88,7 @@ void SetGoniometer::exec() {
<< "_FixedValue\n";
axisName = "GoniometerAxis" + Strings::toString(i) + "_FixedValue";
try {
- Kernel::DateAndTime now = Kernel::DateAndTime::getCurrentTime();
+ Mantid::Types::DateAndTime now = Mantid::Types::DateAndTime::getCurrentTime();
auto tsp = new Kernel::TimeSeriesProperty<double>(axisName);
tsp->addValue(now, angle);
tsp->setUnits("degree");
diff --git a/Framework/Crystal/test/CentroidPeaksTest.h b/Framework/Crystal/test/CentroidPeaksTest.h
index 58897139904b4a5bd94627160871fe7f0f2f86de..1b73b3a4f2d101065947ae589ba6a9628e4e0e5c 100644
--- a/Framework/Crystal/test/CentroidPeaksTest.h
+++ b/Framework/Crystal/test/CentroidPeaksTest.h
@@ -9,6 +9,7 @@
#include "MantidDataObjects/PeaksWorkspace.h"
#include "MantidDataObjects/WorkspaceCreation.h"
#include "MantidHistogramData/LinearGenerator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
@@ -31,6 +32,7 @@ using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
using namespace Mantid::Geometry;
using namespace Mantid::HistogramData;
+using namespace Mantid::Types;
class CentroidPeaksTest : public CxxTest::TestSuite {
public:
@@ -55,7 +57,8 @@ public:
size_t nd = 1;
// Make a random generator for each dimensions
typedef boost::variate_generator<boost::mt19937 &,
- boost::uniform_real<double>> gen_t;
+ boost::uniform_real<double>>
+ gen_t;
gen_t *gens[1];
for (size_t d = 0; d < nd; ++d) {
double min = -1.;
@@ -85,7 +88,8 @@ public:
// a bug
retVal->populateInstrumentParameters();
- DateAndTime run_start("2010-01-01T00:00:00");
+ DateAndTime run_start =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
for (int pix = 0; pix < numPixels; ++pix) {
auto &el = retVal->getSpectrum(pix);
diff --git a/Framework/Crystal/test/NormaliseVanadiumTest.h b/Framework/Crystal/test/NormaliseVanadiumTest.h
index d52ea3e9246a5e0cd1b855d3745cdcde53db03de..3331e343855860b82a2023506eef5ad28ce93f05 100644
--- a/Framework/Crystal/test/NormaliseVanadiumTest.h
+++ b/Framework/Crystal/test/NormaliseVanadiumTest.h
@@ -6,6 +6,7 @@
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidHistogramData/LinearGenerator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
@@ -27,14 +28,15 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
using namespace Mantid::Geometry;
+using namespace Mantid::Types;
using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::LinearGenerator;
namespace {
/** Create an EventWorkspace containing fake data of single-crystal diffraction.
-*
-* @return EventWorkspace_sptr
-*/
+ *
+ * @return EventWorkspace_sptr
+ */
EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
FacilityHelper::ScopedFacilities loadTESTFacility(
"IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
@@ -51,7 +53,8 @@ EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
size_t nd = 1;
// Make a random generator for each dimensions
typedef boost::variate_generator<boost::mt19937 &,
- boost::uniform_real<double>> gen_t;
+ boost::uniform_real<double>>
+ gen_t;
gen_t *gens[1];
for (size_t d = 0; d < nd; ++d) {
double min = -1.;
@@ -81,7 +84,8 @@ EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
// a bug
retVal->populateInstrumentParameters();
- DateAndTime run_start("2010-01-01T00:00:00");
+ DateAndTime run_start =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
for (int pix = 0; pix < numPixels; pix++) {
EventList &el = retVal->getSpectrum(pix);
@@ -100,9 +104,8 @@ EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
(pix % 100 - 50.5) * (pix % 100 - 50.5)));
for (int i = 0; i < r; i++) {
el += TofEvent(
- 0.75 +
- binDelta *
- (((*gens[0])() + (*gens[0])() + (*gens[0])()) * 2. - 3.),
+ 0.75 + binDelta *
+ (((*gens[0])() + (*gens[0])() + (*gens[0])()) * 2. - 3.),
run_start + double(i));
}
}
@@ -124,10 +127,10 @@ EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
}
/** Creates an instance of the NormaliseVanadium algorithm and sets its
-* properties.
-*
-* @return NormaliseVanadium alg
-*/
+ * properties.
+ *
+ * @return NormaliseVanadium alg
+ */
IAlgorithm_sptr createAlgorithm() {
int numEventsPer = 100;
MatrixWorkspace_sptr inputW = createDiffractionEventWorkspace(numEventsPer);
@@ -142,7 +145,7 @@ IAlgorithm_sptr createAlgorithm() {
return alg;
}
-}
+} // namespace
class NormaliseVanadiumImpl : public NormaliseVanadium {
public:
diff --git a/Framework/Crystal/test/PeakIntegrationTest.h b/Framework/Crystal/test/PeakIntegrationTest.h
index fefab95108525d2a61e6057b4ada6093b8e94e29..98b17307c752d9b18bd383aea2b972b3190758b1 100644
--- a/Framework/Crystal/test/PeakIntegrationTest.h
+++ b/Framework/Crystal/test/PeakIntegrationTest.h
@@ -15,6 +15,7 @@
#include "MantidTestHelpers/FacilityHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include <MantidKernel/DateAndTimeHelpers.h>
#include <boost/random/linear_congruential.hpp>
#include <boost/random/mersenne_twister.hpp>
#include <boost/random/uniform_int.hpp>
@@ -32,6 +33,7 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::DataHandling;
using namespace Mantid::Geometry;
+using namespace Mantid::Types;
using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::LinearGenerator;
@@ -58,7 +60,8 @@ public:
size_t nd = 1;
// Make a random generator for each dimensions
typedef boost::variate_generator<boost::mt19937 &,
- boost::uniform_real<double>> gen_t;
+ boost::uniform_real<double>>
+ gen_t;
gen_t *gens[1];
for (size_t d = 0; d < nd; ++d) {
double min = -1.;
@@ -88,7 +91,8 @@ public:
// a bug
retVal->populateInstrumentParameters();
- DateAndTime run_start("2010-01-01T00:00:00");
+ DateAndTime run_start =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
for (int pix = 0; pix < numPixels; pix++) {
EventList &el = retVal->getSpectrum(pix);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h b/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h
index 787f6efa5dcdee0c6e17241427ea4473d4a746d3..a90599c4a7d3becb89a634f6b96b092167a8dadb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/BankPulseTimes.h
@@ -2,7 +2,7 @@
#define MANTID_KERNEL_BANKPULSETIMES_H
#include "MantidKernel/Property.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <nexus/NeXusFile.hpp>
@@ -21,7 +21,7 @@ public:
BankPulseTimes(::NeXus::File &file, const std::vector<int> &pNumbers);
/// Constructor with vector of DateAndTime
- BankPulseTimes(const std::vector<Mantid::Kernel::DateAndTime> ×);
+ BankPulseTimes(const std::vector<Mantid::Types::DateAndTime> ×);
/// Destructor
~BankPulseTimes();
@@ -36,7 +36,7 @@ public:
size_t numPulses;
/// Array of the pulse times
- Mantid::Kernel::DateAndTime *pulseTimes;
+ Mantid::Types::DateAndTime *pulseTimes;
/// Vector of period numbers corresponding to each pulse
std::vector<int> periodNumbers;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
index 69fb1d446dd0d648920a420dfc0400ec9f37163f..0dc323baac3ee51831ffa208a78c151eed667f72 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
@@ -93,7 +93,7 @@ public:
std::vector<size_t>
getDetectorIDToWorkspaceIndexVector(Mantid::specnum_t &offset,
bool dothrow) const;
- Kernel::DateAndTime getFirstPulseTime() const;
+ Mantid::Types::DateAndTime getFirstPulseTime() const;
void setAllX(const HistogramData::BinEdges &x);
size_t getNumberEvents() const;
void resizeTo(const size_t size);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
index 13fef886f4cba1f333c4caeef4e6bff5eafbe631..4d8a1bdd63361224de30b2e9f00e7089ac2ef16b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
@@ -183,7 +183,7 @@ private:
std::vector<int64_t> m_spectraList; ///<the list of Spectra
/// The times for each pulse.
- std::vector<Kernel::DateAndTime> pulsetimes;
+ std::vector<Mantid::Types::DateAndTime> pulsetimes;
/// The index of the first event in each pulse.
std::vector<uint64_t> m_vecEventIndex;
/// The proton charge on a pulse by pulse basis.
@@ -212,7 +212,7 @@ private:
/// detector IDs. Part of error events.
std::set<PixelType> wrongdetids; ///<set of all wrong detector IDs
std::map<PixelType, size_t> wrongdetidmap;
- std::vector<std::vector<Kernel::DateAndTime>> wrongdetid_pulsetimes;
+ std::vector<std::vector<Mantid::Types::DateAndTime>> wrongdetid_pulsetimes;
std::vector<std::vector<double>> wrongdetid_tofs;
/// the number of events that were ignored (not loaded) because, e.g. of only
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
index de0e6b689554a546b5a2fce7f6affa9dd19b750c..edc25644ad036b9fa12325b4b0aa08f8e864791b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -150,9 +150,9 @@ public:
int32_t m_specMax;
/// Filter by start time
- Kernel::DateAndTime filter_time_start;
+ Mantid::Types::DateAndTime filter_time_start;
/// Filter by stop time
- Kernel::DateAndTime filter_time_stop;
+ Mantid::Types::DateAndTime filter_time_stop;
/// chunk number
int chunk;
/// number of chunks
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
index 11b8f5891d27c4163d357846e2a17a36a5f3fadf..2ae9b85106df0e63862f3775a966fa6b776c9d81 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
@@ -124,7 +124,7 @@ private:
std::vector<int64_t> spectra_list; ///<the list of Spectra
/// The times for each pulse.
- std::vector<Kernel::DateAndTime> pulsetimes;
+ std::vector<Mantid::Types::DateAndTime> pulsetimes;
/// The index of the first event in each pulse.
std::vector<uint64_t> event_indices;
/// The proton charge on a pulse by pulse basis.
@@ -153,7 +153,7 @@ private:
/// detector IDs. Part of error events.
std::set<PixelType> wrongdetids; ///<set of all wrong detector IDs
std::map<PixelType, size_t> wrongdetidmap;
- std::vector<std::vector<Kernel::DateAndTime>> wrongdetid_pulsetimes;
+ std::vector<std::vector<Mantid::Types::DateAndTime>> wrongdetid_pulsetimes;
std::vector<std::vector<double>> wrongdetid_tofs;
/// the number of events that were ignored (not loaded) because, e.g. of only
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
index 7bd9129cd197510acdf94d4bde53a046d68164be..0ccb568e518e854c980e5eb91aec05b6375510d6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLDiffraction.h
@@ -4,7 +4,7 @@
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/DllConfig.h"
#include "MantidDataHandling/LoadHelper.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/V3D.h"
#include "MantidNexus/NexusClasses.h"
@@ -66,7 +66,7 @@ private:
void init() override;
void exec() override;
- std::vector<Kernel::DateAndTime>
+ std::vector<Mantid::Types::DateAndTime>
getAbsoluteTimes(const NeXus::NXDouble &) const;
std::vector<double> getAxis(const NeXus::NXDouble &) const;
std::vector<double> getDurations(const NeXus::NXDouble &) const;
@@ -107,7 +107,7 @@ private:
std::string m_instName; ///< instrument name to load the IDF
std::set<std::string> m_instNames; ///< supported instruments
std::string m_fileName; ///< file name to load
- Kernel::DateAndTime m_startTime; ///< start time of acquisition
+ Mantid::Types::DateAndTime m_startTime; ///< start time of acquisition
ScanType m_scanType; ///< NoScan, DetectorScan or OtherScan
std::vector<ScannedVariables> m_scanVar; ///< holds the scan info
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
index 6d2faee4ef1d5cdc776e808e015554a003efb367..52fd5f0e72abbe0f1704e06382db685fdaef5187 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
@@ -116,10 +116,10 @@ public:
API::Algorithm *const pAlg);
/// Extract the start time from a raw file
- static Kernel::DateAndTime extractStartTime(ISISRAW *isisRaw);
+ static Mantid::Types::DateAndTime extractStartTime(ISISRAW *isisRaw);
/// Extract the end time from a raw file
- static Kernel::DateAndTime extractEndTime(ISISRAW *isisRaw);
+ static Mantid::Types::DateAndTime extractEndTime(ISISRAW *isisRaw);
protected:
/// Overwrites Algorithm method.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
index 3908d455a4337d8b1dfca2c637b94689857d9ed0..58ed1ccb81148de43bc16683090278326fddd0fb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
@@ -1,7 +1,7 @@
#ifndef MANTID_DATAHANDLING_LoadSpice2D_H
#define MANTID_DATAHANDLING_LoadSpice2D_H
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidAPI/IFileLoader.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataHandling/XmlHandler.h"
@@ -120,8 +120,8 @@ private:
double m_wavelength{0.0};
double m_dwavelength{0.0};
double m_sansSpiceXmlFormatVersion{0.0};
- Mantid::Kernel::DateAndTime m_startTime;
- Mantid::Kernel::DateAndTime m_endTime;
+ Mantid::Types::DateAndTime m_startTime;
+ Mantid::Types::DateAndTime m_endTime;
};
} // namespace DataHandling
} // namespace Mantid
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
index ec63c5cba8bb2bffec69bf4fcb7d2e4de1186191..a1a9a8d4df00b2aa877e200b6858861ad4b53c2f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
@@ -9,7 +9,7 @@
#include "MantidAPI/SpectraDetectorTypes.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidNexus/NexusClasses.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <mutex>
@@ -94,7 +94,7 @@ protected:
const detid2index_map &id_to_wi);
/// List of the absolute time of each pulse
- std::vector<Kernel::DateAndTime> pulseTimes;
+ std::vector<Mantid::Types::DateAndTime> pulseTimes;
/// Number of bins
size_t m_numBins;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h b/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h
index 8ecb39e06553d48c17de6d34b3b0b47da3db2b3d..5f9b4c0dfc3d6175d410c67c5a231de95e743b83 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h
@@ -2,7 +2,7 @@
#define MANTID_DATAHANDLING_STARTANDENDTIMEFROMNEXUSFILEEXTRACTOR_H_
#include "MantidDataHandling/DllConfig.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <string>
namespace Mantid {
@@ -29,9 +29,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-Mantid::Kernel::DateAndTime DLLExport
+Mantid::Types::DateAndTime DLLExport
extractStartTime(const std::string &filename);
-Mantid::Kernel::DateAndTime DLLExport
+Mantid::Types::DateAndTime DLLExport
extractEndTime(const std::string &filename);
} // namespace DataHandling
} // namespace Mantid
diff --git a/Framework/DataHandling/src/BankPulseTimes.cpp b/Framework/DataHandling/src/BankPulseTimes.cpp
index 923e2113d982c94cdc9bd5a59e9f280ce8b7248e..29077de4bc66f0e0477945348e2bb5a1bf248198 100644
--- a/Framework/DataHandling/src/BankPulseTimes.cpp
+++ b/Framework/DataHandling/src/BankPulseTimes.cpp
@@ -1,6 +1,8 @@
#include "MantidDataHandling/BankPulseTimes.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
//===============================================================================================
// BankPulseTimes
@@ -21,7 +23,7 @@ BankPulseTimes::BankPulseTimes(::NeXus::File &file,
file.openData("event_time_zero");
// Read the offset (time zero)
file.getAttr("offset", startTime);
- Mantid::Kernel::DateAndTime start(startTime);
+ Mantid::Types::DateAndTime start = DateAndTimeHelpers::createFromISO8601(startTime);
// Load the seconds offsets
std::vector<double> seconds;
file.getData(seconds);
diff --git a/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp b/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
index bbc5b8e56a9d9cc8042874185e062979f5b4abb9..942c75314a8d698e7b3e7480f789d645a4c65302 100644
--- a/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
+++ b/Framework/DataHandling/src/CreateChunkingFromInstrument.cpp
@@ -10,6 +10,7 @@
#include "MantidGeometry/IDetector.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/StringTokenizer.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <nexus/NeXusFile.hpp>
#include <nexus/NeXusException.hpp>
@@ -20,6 +21,7 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
using namespace std;
typedef Mantid::Kernel::StringTokenizer tokenizer;
@@ -310,7 +312,7 @@ Instrument_const_sptr CreateChunkingFromInstrument::getInstrument() {
nxsfile.openGroup(top_entry_name, "NXentry");
nxsfile.readData("start_time", start_time);
tempWS->mutableRun().addProperty(
- "run_start", DateAndTime(start_time).toISO8601String(), true);
+ "run_start", DateAndTimeHelpers::createFromISO8601(start_time).toISO8601String(), true);
// get the instrument name
nxsfile.openGroup("instrument", "NXinstrument");
diff --git a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
index fd3f4a929521219bcce38a07e143844eccda3a1a..71d95ce99bdffe54ff15e76472956b3ec43c5ba4 100644
--- a/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
+++ b/Framework/DataHandling/src/CreateSimulationWorkspace.cpp
@@ -26,8 +26,8 @@
namespace {
struct StartAndEndTime {
- Mantid::Kernel::DateAndTime startTime;
- Mantid::Kernel::DateAndTime endTime;
+ Mantid::Types::DateAndTime startTime;
+ Mantid::Types::DateAndTime endTime;
};
StartAndEndTime getStartAndEndTimesFromRawFile(std::string filename) {
@@ -50,8 +50,8 @@ StartAndEndTime getStartAndEndTimesFromRawFile(std::string filename) {
}
StartAndEndTime getStartAndEndTimesFromNexusFile(
- std::string filename, const Mantid::Kernel::DateAndTime &startTimeDefault,
- const Mantid::Kernel::DateAndTime &endTimeDefault) {
+ std::string filename, const Mantid::Types::DateAndTime &startTimeDefault,
+ const Mantid::Types::DateAndTime &endTimeDefault) {
StartAndEndTime startAndEndTime;
try {
startAndEndTime.startTime =
@@ -407,15 +407,15 @@ void CreateSimulationWorkspace::setStartDate(
auto hasDetTableFile = !detTableFile.empty();
auto &run = workspace->mutableRun();
- Kernel::DateAndTime startTime;
- Kernel::DateAndTime endTime;
+ Mantid::Types::DateAndTime startTime;
+ Mantid::Types::DateAndTime endTime;
try {
// The start and end times might not be valid, and hence can throw
startTime = run.startTime();
endTime = run.endTime();
} catch (std::runtime_error &) {
- startTime = Kernel::DateAndTime::getCurrentTime();
- endTime = Kernel::DateAndTime::getCurrentTime();
+ startTime = Mantid::Types::DateAndTime::getCurrentTime();
+ endTime = Mantid::Types::DateAndTime::getCurrentTime();
}
if (hasDetTableFile) {
diff --git a/Framework/DataHandling/src/EventWorkspaceCollection.cpp b/Framework/DataHandling/src/EventWorkspaceCollection.cpp
index a8161abf967247896d4c1c2d177368326536b763..f8fa5aae86a0b5bca6ae5b41aabf92bffa3c2c59 100644
--- a/Framework/DataHandling/src/EventWorkspaceCollection.cpp
+++ b/Framework/DataHandling/src/EventWorkspaceCollection.cpp
@@ -212,7 +212,7 @@ EventWorkspaceCollection::getDetectorIDToWorkspaceIndexVector(
return m_WsVec[0]->getDetectorIDToWorkspaceIndexVector(offset, dothrow);
}
-Kernel::DateAndTime EventWorkspaceCollection::getFirstPulseTime() const {
+Mantid::Types::DateAndTime EventWorkspaceCollection::getFirstPulseTime() const {
return m_WsVec[0]->getFirstPulseTime();
}
void EventWorkspaceCollection::setAllX(const HistogramData::BinEdges &x) {
diff --git a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
index cb11664184090ab50b3d4fd371e85f43a515f0ea..9104ff22e30d40b8ba2003714bb17c19d8ab0f15 100644
--- a/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
+++ b/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
@@ -18,7 +18,7 @@
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/CPUTimer.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/FileValidator.h"
#include "MantidKernel/Glob.h"
#include "MantidKernel/ListValidator.h"
@@ -41,6 +41,7 @@
#include <vector>
// #define DBOUT
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace DataHandling {
@@ -1146,7 +1147,7 @@ void FilterEventsByLogValuePreNexus::procEventsLinear(
// Local data structure for loaded events
std::map<PixelType, size_t> local_pidindexmap;
- std::vector<std::vector<Kernel::DateAndTime>> local_pulsetimes;
+ std::vector<std::vector<Mantid::Types::DateAndTime>> local_pulsetimes;
std::vector<std::vector<double>> local_tofs;
std::set<PixelType> local_wrongdetids;
@@ -1290,7 +1291,7 @@ void FilterEventsByLogValuePreNexus::procEventsLinear(
size_t newindex = local_pulsetimes.size();
local_pidindexmap[pixelid] = newindex;
- std::vector<Kernel::DateAndTime> tempvectime;
+ std::vector<Mantid::Types::DateAndTime> tempvectime;
std::vector<double> temptofs;
local_pulsetimes.push_back(tempvectime);
local_tofs.push_back(temptofs);
@@ -1336,7 +1337,7 @@ void FilterEventsByLogValuePreNexus::procEventsLinear(
size_t newindex = this->wrongdetid_pulsetimes.size();
this->wrongdetidmap[tmpid] = newindex;
- std::vector<Kernel::DateAndTime> vec_pulsetimes;
+ std::vector<Mantid::Types::DateAndTime> vec_pulsetimes;
std::vector<double> vec_tofs;
this->wrongdetid_pulsetimes.push_back(vec_pulsetimes);
this->wrongdetid_tofs.push_back(vec_tofs);
@@ -1749,7 +1750,7 @@ void FilterEventsByLogValuePreNexus::filterEventsLinear(
// NOT CALLED AT ALL
// Local data structure for loaded events
std::map<PixelType, size_t> local_pidindexmap;
- std::vector<std::vector<Kernel::DateAndTime> > local_pulsetimes;
+ std::vector<std::vector<Mantid::Types::DateAndTime> > local_pulsetimes;
std::vector<std::vector<double> > local_tofs;
#endif
@@ -2065,7 +2066,7 @@ void FilterEventsByLogValuePreNexus::filterEventsLinear(
size_t newindex = local_pulsetimes.size();
local_pidindexmap[pixelid] = newindex;
- std::vector<Kernel::DateAndTime> tempvectime;
+ std::vector<Mantid::Types::DateAndTime> tempvectime;
std::vector<double> temptofs;
local_pulsetimes.push_back(tempvectime);
local_tofs.push_back(temptofs);
diff --git a/Framework/DataHandling/src/LoadBBY.cpp b/Framework/DataHandling/src/LoadBBY.cpp
index 313da1a3b05074dd91f5486c806133e0943f9388..89d945bfc0b7948be2b87e6a7d5284ae73bdae97 100644
--- a/Framework/DataHandling/src/LoadBBY.cpp
+++ b/Framework/DataHandling/src/LoadBBY.cpp
@@ -12,6 +12,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/UnitFactory.h"
@@ -23,6 +24,8 @@
#include <Poco/TemporaryFile.h>
#include <Poco/Util/PropertyFileConfiguration.h>
+using namespace Mantid::Types;
+
namespace Mantid {
namespace DataHandling {
@@ -333,11 +336,12 @@ void LoadBBY::exec() {
"bm_counts", static_cast<double>(frame_count) * period /
1.0e6); // static_cast<double>(instrumentInfo.bm_counts)
- Kernel::time_duration duration = boost::posix_time::microseconds(
+ Types::time_duration duration = boost::posix_time::microseconds(
static_cast<boost::int64_t>(static_cast<double>(frame_count) * period));
- Kernel::DateAndTime start_time("2000-01-01T00:00:00");
- Kernel::DateAndTime end_time(start_time + duration);
+ Mantid::Types::DateAndTime start_time =
+ DateAndTimeHelpers::createFromISO8601("2000-01-01T00:00:00");
+ Mantid::Types::DateAndTime end_time(start_time + duration);
logManager.addProperty("start_time", start_time.toISO8601String());
logManager.addProperty("end_time", end_time.toISO8601String());
@@ -810,5 +814,5 @@ void LoadBBY::loadEvents(API::Progress &prog, const char *progMsg,
}
}
-} // DataHandling
-} // Mantid
+} // namespace DataHandling
+} // namespace Mantid
diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
index d1059887d1cd238904ed7b7725476688564b18f5..43723a635f214c8467233ea691ce9768d22774d0 100644
--- a/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -29,10 +29,10 @@
#include <functional>
+using Mantid::Types::DateAndTime;
using std::map;
using std::string;
using std::vector;
-
using namespace ::NeXus;
namespace Mantid {
@@ -67,29 +67,29 @@ void copyLogs(const Mantid::DataHandling::EventWorkspaceCollection_sptr &from,
}
}
}
-}
+} // namespace
//==============================================================================================
// Class LoadBankFromDiskTask
//==============================================================================================
/** This task does the disk IO from loading the NXS file,
-* and so will be on a disk IO mutex */
+ * and so will be on a disk IO mutex */
class LoadBankFromDiskTask : public Task {
public:
//---------------------------------------------------------------------------------------------------
/** Constructor
- *
- * @param alg :: Handle to the main algorithm
- * @param entry_name :: The pathname of the bank to load
- * @param entry_type :: The classtype of the entry to load
- * @param numEvents :: The number of events in the bank.
- * @param oldNeXusFileNames :: Identify if file is of old variety.
- * @param prog :: an optional Progress object
- * @param ioMutex :: a mutex shared for all Disk I-O tasks
- * @param scheduler :: the ThreadScheduler that runs this task.
- * @param framePeriodNumbers :: Period numbers corresponding to each frame
- */
+ *
+ * @param alg :: Handle to the main algorithm
+ * @param entry_name :: The pathname of the bank to load
+ * @param entry_type :: The classtype of the entry to load
+ * @param numEvents :: The number of events in the bank.
+ * @param oldNeXusFileNames :: Identify if file is of old variety.
+ * @param prog :: an optional Progress object
+ * @param ioMutex :: a mutex shared for all Disk I-O tasks
+ * @param scheduler :: the ThreadScheduler that runs this task.
+ * @param framePeriodNumbers :: Period numbers corresponding to each frame
+ */
LoadBankFromDiskTask(LoadEventNexus *alg, const std::string &entry_name,
const std::string &entry_type,
const std::size_t numEvents,
@@ -113,8 +113,8 @@ public:
//---------------------------------------------------------------------------------------------------
/** Load the pulse times, if needed. This sets
- * thisBankPulseTimes to the right pointer.
- * */
+ * thisBankPulseTimes to the right pointer.
+ * */
void loadPulseTimes(::NeXus::File &file) {
try {
// First, get info about the event_time_zero field in this bank
@@ -182,13 +182,13 @@ public:
//---------------------------------------------------------------------------------------------------
/** Open the event_id field and validate the contents
- *
- * @param file :: File handle for the NeXus file
- * @param start_event :: set to the index of the first event
- * @param stop_event :: set to the index of the last event + 1
- * @param event_index :: (a list of size of # of pulses giving the index in
- *the event list for that pulse)
- */
+ *
+ * @param file :: File handle for the NeXus file
+ * @param start_event :: set to the index of the first event
+ * @param stop_event :: set to the index of the last event + 1
+ * @param event_index :: (a list of size of # of pulses giving the index in
+ *the event list for that pulse)
+ */
void prepareEventId(::NeXus::File &file, size_t &start_event,
size_t &stop_event, std::vector<uint64_t> &event_index) {
// Get the list of pixel ID's
@@ -251,7 +251,7 @@ public:
//---------------------------------------------------------------------------------------------------
/** Load the event_id field, which has been open
- */
+ */
void loadEventId(::NeXus::File &file) {
// This is the data size
::NeXus::Info id_info = file.getInfo();
@@ -262,10 +262,10 @@ public:
// Check that the required space is there in the file.
if (dim0 < m_loadSize[0] + m_loadStart[0]) {
- alg->getLogger().warning() << "Entry " << entry_name
- << "'s event_id field is too small (" << dim0
- << ") to load the desired data size ("
- << m_loadSize[0] + m_loadStart[0] << ").\n";
+ alg->getLogger().warning()
+ << "Entry " << entry_name << "'s event_id field is too small ("
+ << dim0 << ") to load the desired data size ("
+ << m_loadSize[0] + m_loadStart[0] << ").\n";
m_loadError = true;
}
@@ -316,7 +316,7 @@ public:
//---------------------------------------------------------------------------------------------------
/** Open and load the times-of-flight data
- */
+ */
void loadTof(::NeXus::File &file) {
// Allocate the array
auto temp = new float[m_loadSize[0]];
@@ -364,7 +364,7 @@ public:
//----------------------------------------------------------------------------------------------
/** Load weight of weigthed events
- */
+ */
void loadEventWeights(::NeXus::File &file) {
try {
// First, get info about the event_weight field in this bank
@@ -482,13 +482,13 @@ public:
} // try block
catch (std::exception &e) {
- alg->getLogger().error() << "Error while loading bank " << entry_name
- << ":\n";
+ alg->getLogger().error()
+ << "Error while loading bank " << entry_name << ":\n";
alg->getLogger().error() << e.what() << '\n';
m_loadError = true;
} catch (...) {
- alg->getLogger().error() << "Unspecified error while loading bank "
- << entry_name << '\n';
+ alg->getLogger().error()
+ << "Unspecified error while loading bank " << entry_name << '\n';
m_loadError = true;
}
@@ -570,11 +570,11 @@ public:
//---------------------------------------------------------------------------------------------------
/**
- * Interpret the value describing the number of events. If the number is
- * positive return it unchanged.
- * If the value is negative (can happen at ISIS) add 2^32 to it.
- * @param size :: The size of events value.
- */
+ * Interpret the value describing the number of events. If the number is
+ * positive return it unchanged.
+ * If the value is negative (can happen at ISIS) add 2^32 to it.
+ * @param size :: The size of events value.
+ */
int64_t recalculateDataSize(const int64_t &size) {
if (size < 0) {
const int64_t shift = int64_t(1) << 32;
@@ -626,7 +626,7 @@ private:
//----------------------------------------------------------------------------------------------
/** Empty default constructor
-*/
+ */
LoadEventNexus::LoadEventNexus()
: IFileLoader<Kernel::NexusDescriptor>(), m_filename(), filter_tof_min(0),
filter_tof_max(0), m_specList(), m_specMin(0), m_specMax(0),
@@ -650,11 +650,11 @@ LoadEventNexus::~LoadEventNexus() {
//----------------------------------------------------------------------------------------------
/**
-* Return the confidence with with this algorithm can load the file
-* @param descriptor A descriptor for the file
-* @returns An integer specifying the confidence level. 0 indicates it will not
-* be used
-*/
+ * Return the confidence with with this algorithm can load the file
+ * @param descriptor A descriptor for the file
+ * @returns An integer specifying the confidence level. 0 indicates it will not
+ * be used
+ */
int LoadEventNexus::confidence(Kernel::NexusDescriptor &descriptor) const {
int confidence(0);
if (descriptor.classTypeExists("NXevent_data")) {
@@ -668,7 +668,7 @@ int LoadEventNexus::confidence(Kernel::NexusDescriptor &descriptor) const {
//----------------------------------------------------------------------------------------------
/** Initialisation method.
-*/
+ */
void LoadEventNexus::init() {
const std::vector<std::string> exts{"_event.nxs", ".nxs.h5", ".nxs"};
this->declareProperty(
@@ -871,7 +871,7 @@ void LoadEventNexus::init() {
//----------------------------------------------------------------------------------------------
/** set the name of the top level NXentry m_top_entry_name
-*/
+ */
void LoadEventNexus::setTopEntryName() {
std::string nxentryProperty = getProperty("NXentryName");
if (!nxentryProperty.empty()) {
@@ -937,8 +937,8 @@ void LoadEventNexus::filterDuringPause<EventWorkspaceCollection_sptr>(
//------------------------------------------------------------------------------------------------
/** Executes the algorithm. Reading in the file and creating and populating
-* the output workspace
-*/
+ * the output workspace
+ */
void LoadEventNexus::exec() {
// Retrieve the filename from the properties
m_filename = getPropertyValue("Filename");
@@ -1012,9 +1012,9 @@ void LoadEventNexus::exec() {
//-----------------------------------------------------------------------------
/** Generate a look-up table where the index = the pixel ID of an event
-* and the value = a pointer to the EventList in the workspace
-* @param vectors :: the array to create the map on
-*/
+ * and the value = a pointer to the EventList in the workspace
+ * @param vectors :: the array to create the map on
+ */
template <class T>
void LoadEventNexus::makeMapToEventLists(std::vector<std::vector<T>> &vectors) {
vectors.resize(m_ws->nPeriods());
@@ -1072,16 +1072,16 @@ void LoadEventNexus::makeMapToEventLists(std::vector<std::vector<T>> &vectors) {
}
/**
-* Get the number of events in the currently opened group.
-*
-* @param file The handle to the nexus file opened to the group to look at.
-* @param hasTotalCounts Whether to try looking at the total_counts field. This
-* variable will be changed if the field is not there.
-* @param oldNeXusFileNames Whether to try using old names. This variable will
-* be changed if it is determined that old names are being used.
-*
-* @return The number of events.
-*/
+ * Get the number of events in the currently opened group.
+ *
+ * @param file The handle to the nexus file opened to the group to look at.
+ * @param hasTotalCounts Whether to try looking at the total_counts field. This
+ * variable will be changed if the field is not there.
+ * @param oldNeXusFileNames Whether to try using old names. This variable will
+ * be changed if it is determined that old names are being used.
+ *
+ * @return The number of events.
+ */
std::size_t numEvents(::NeXus::File &file, bool &hasTotalCounts,
bool &oldNeXusFileNames) {
// try getting the value of total_counts
@@ -1133,18 +1133,18 @@ void LoadEventNexus::createWorkspaceIndexMaps(
}
/** Load the instrument from the nexus file
-*
-* @param nexusfilename :: The name of the nexus file being loaded
-* @param localWorkspace :: Templated workspace in which to put the instrument
-*geometry
-* @param alg :: Handle of the algorithm
-* @param returnpulsetimes :: flag to return shared pointer for BankPulseTimes,
-*otherwise NULL.
-* @param nPeriods : Number of periods (write to)
-* @param periodLog : Period logs DateAndTime to int map.
-*
-* @return Pulse times given in the DAS logs
-*/
+ *
+ * @param nexusfilename :: The name of the nexus file being loaded
+ * @param localWorkspace :: Templated workspace in which to put the instrument
+ *geometry
+ * @param alg :: Handle of the algorithm
+ * @param returnpulsetimes :: flag to return shared pointer for BankPulseTimes,
+ *otherwise NULL.
+ * @param nPeriods : Number of periods (write to)
+ * @param periodLog : Period logs DateAndTime to int map.
+ *
+ * @return Pulse times given in the DAS logs
+ */
template <typename T>
boost::shared_ptr<BankPulseTimes> LoadEventNexus::runLoadNexusLogs(
const std::string &nexusfilename, T localWorkspace, API::Algorithm &alg,
@@ -1186,7 +1186,7 @@ boost::shared_ptr<BankPulseTimes> LoadEventNexus::runLoadNexusLogs(
Kernel::TimeSeriesProperty<double> *log =
dynamic_cast<Kernel::TimeSeriesProperty<double> *>(
localWorkspace->mutableRun().getProperty("proton_charge"));
- std::vector<Kernel::DateAndTime> temp;
+ std::vector<Mantid::Types::DateAndTime> temp;
if (log)
temp = log->timesAsVector();
// if (returnpulsetimes) out = new BankPulseTimes(temp);
@@ -1195,11 +1195,13 @@ boost::shared_ptr<BankPulseTimes> LoadEventNexus::runLoadNexusLogs(
// Use the first pulse as the run_start time.
if (!temp.empty()) {
- if (temp[0] < Kernel::DateAndTime("1991-01-01T00:00:00"))
+ if (temp[0] < Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "1991-01-01T00:00:00"))
alg.getLogger().warning() << "Found entries in the proton_charge "
"sample log with invalid pulse time!\n";
- Kernel::DateAndTime run_start = localWorkspace->getFirstPulseTime();
+ Mantid::Types::DateAndTime run_start =
+ localWorkspace->getFirstPulseTime();
// add the start of the run as a ISO8601 date/time string. The start =
// first non-zero time.
// (this is used in LoadInstrument to find the right instrument file to
@@ -1227,19 +1229,19 @@ boost::shared_ptr<BankPulseTimes> LoadEventNexus::runLoadNexusLogs(
}
/** Load the instrument from the nexus file
-*
-* @param nexusfilename :: The name of the nexus file being loaded
-* @param localWorkspace :: EventWorkspaceCollection in which to put the
-*instrument
-*geometry
-* @param alg :: Handle of the algorithm
-* @param returnpulsetimes :: flag to return shared pointer for BankPulseTimes,
-*otherwise NULL.
-* @param nPeriods : Number of periods (write to)
-* @param periodLog : Period logs DateAndTime to int map.
-*
-* @return Pulse times given in the DAS logs
-*/
+ *
+ * @param nexusfilename :: The name of the nexus file being loaded
+ * @param localWorkspace :: EventWorkspaceCollection in which to put the
+ *instrument
+ *geometry
+ * @param alg :: Handle of the algorithm
+ * @param returnpulsetimes :: flag to return shared pointer for BankPulseTimes,
+ *otherwise NULL.
+ * @param nPeriods : Number of periods (write to)
+ * @param periodLog : Period logs DateAndTime to int map.
+ *
+ * @return Pulse times given in the DAS logs
+ */
template <>
boost::shared_ptr<BankPulseTimes>
LoadEventNexus::runLoadNexusLogs<EventWorkspaceCollection_sptr>(
@@ -1255,15 +1257,15 @@ LoadEventNexus::runLoadNexusLogs<EventWorkspaceCollection_sptr>(
//-----------------------------------------------------------------------------
/**
-* Load events from the file.
-* @param prog :: A pointer to the progress reporting object
-* @param monitors :: If true the events from the monitors are loaded and not the
-* main banks
-*
-* This also loads the instrument, but only if it has not been set in the
-*workspace
-* being used as input (m_ws data member). Same applies to the logs.
-*/
+ * Load events from the file.
+ * @param prog :: A pointer to the progress reporting object
+ * @param monitors :: If true the events from the monitors are loaded and not
+ *the main banks
+ *
+ * This also loads the instrument, but only if it has not been set in the
+ *workspace
+ * being used as input (m_ws data member). Same applies to the logs.
+ */
void LoadEventNexus::loadEvents(API::Progress *const prog,
const bool monitors) {
bool metaDataOnly = getProperty("MetaDataOnly");
@@ -1395,8 +1397,8 @@ void LoadEventNexus::loadEvents(API::Progress *const prog,
// Default to ALL pulse times
bool is_time_filtered = false;
- filter_time_start = Kernel::DateAndTime::minimum();
- filter_time_stop = Kernel::DateAndTime::maximum();
+ filter_time_start = Mantid::Types::DateAndTime::minimum();
+ filter_time_stop = Mantid::Types::DateAndTime::maximum();
if (m_allBanksPulseTimes->numPulses > 0) {
// If not specified, use the limits of doubles. Otherwise, convert from
@@ -1610,9 +1612,10 @@ void LoadEventNexus::loadEvents(API::Progress *const prog,
g_log.warning() << "The shortest TOF was negative! At least 1 event has an "
"invalid time-of-flight.\n";
if (bad_tofs > 0)
- g_log.warning() << "Found " << bad_tofs << " events with TOF > 2e8. This "
- "may indicate errors in the raw "
- "TOF data.\n";
+ g_log.warning() << "Found " << bad_tofs
+ << " events with TOF > 2e8. This "
+ "may indicate errors in the raw "
+ "TOF data.\n";
// Use T0 offset from TOPAZ Parameter file if it exists
if (m_ws->getInstrument()->hasParameter("T0")) {
@@ -1649,15 +1652,15 @@ void LoadEventNexus::loadEvents(API::Progress *const prog,
//-----------------------------------------------------------------------------
/** Load the instrument from the nexus file
-*
-* @param nexusfilename :: The name of the nexus file being loaded
-* @param localWorkspace :: EventWorkspaceCollection in which to put the
-*instrument
-*geometry
-* @param top_entry_name :: entry name at the top of the Nexus file
-* @param alg :: Handle of the algorithm
-* @return true if successful
-*/
+ *
+ * @param nexusfilename :: The name of the nexus file being loaded
+ * @param localWorkspace :: EventWorkspaceCollection in which to put the
+ *instrument
+ *geometry
+ * @param top_entry_name :: entry name at the top of the Nexus file
+ * @param alg :: Handle of the algorithm
+ * @return true if successful
+ */
template <>
bool LoadEventNexus::runLoadIDFFromNexus<EventWorkspaceCollection_sptr>(
const std::string &nexusfilename,
@@ -1671,9 +1674,9 @@ bool LoadEventNexus::runLoadIDFFromNexus<EventWorkspaceCollection_sptr>(
}
/** method used to return instrument name for some old ISIS files where it is
-* not written properly within the instrument
-* @param hFile :: A reference to the NeXus file opened at the root entry
-*/
+ * not written properly within the instrument
+ * @param hFile :: A reference to the NeXus file opened at the root entry
+ */
std::string
LoadEventNexus::readInstrumentFromISIS_VMSCompat(::NeXus::File &hFile) {
std::string instrumentName;
@@ -1698,16 +1701,16 @@ LoadEventNexus::readInstrumentFromISIS_VMSCompat(::NeXus::File &hFile) {
//-----------------------------------------------------------------------------
/** Load the instrument definition file specified by info in the NXS file for
-* a EventWorkspaceCollection
-*
-* @param nexusfilename :: Used to pick the instrument.
-* @param localWorkspace :: EventWorkspaceCollection in which to put the
-*instrument
-*geometry
-* @param top_entry_name :: entry name at the top of the NXS file
-* @param alg :: Handle of the algorithm
-* @return true if successful
-*/
+ * a EventWorkspaceCollection
+ *
+ * @param nexusfilename :: Used to pick the instrument.
+ * @param localWorkspace :: EventWorkspaceCollection in which to put the
+ *instrument
+ *geometry
+ * @param top_entry_name :: entry name at the top of the NXS file
+ * @param alg :: Handle of the algorithm
+ * @return true if successful
+ */
template <>
bool LoadEventNexus::runLoadInstrument<EventWorkspaceCollection_sptr>(
const std::string &nexusfilename,
@@ -1722,10 +1725,10 @@ bool LoadEventNexus::runLoadInstrument<EventWorkspaceCollection_sptr>(
//-----------------------------------------------------------------------------
/**
-* Deletes banks for a workspace given the bank names.
-* @param workspace :: The workspace to contain the spectra mapping
-* @param bankNames :: Bank names that are in Nexus file
-*/
+ * Deletes banks for a workspace given the bank names.
+ * @param workspace :: The workspace to contain the spectra mapping
+ * @param bankNames :: Bank names that are in Nexus file
+ */
void LoadEventNexus::deleteBanks(EventWorkspaceCollection_sptr workspace,
std::vector<std::string> bankNames) {
Instrument_sptr inst = boost::const_pointer_cast<Instrument>(
@@ -1810,15 +1813,15 @@ void LoadEventNexus::deleteBanks(EventWorkspaceCollection_sptr workspace,
}
//-----------------------------------------------------------------------------
/**
-* Create the required spectra mapping. If the file contains an isis_vms_compat
-* block then
-* the mapping is read from there, otherwise a 1:1 map with the instrument is
-* created (along
-* with the associated spectra axis)
-* @param nxsfile :: The name of a nexus file to load the mapping from
-* @param monitorsOnly :: Load only the monitors is true
-* @param bankNames :: An optional bank name for loading specified banks
-*/
+ * Create the required spectra mapping. If the file contains an isis_vms_compat
+ * block then
+ * the mapping is read from there, otherwise a 1:1 map with the instrument is
+ * created (along
+ * with the associated spectra axis)
+ * @param nxsfile :: The name of a nexus file to load the mapping from
+ * @param monitorsOnly :: Load only the monitors is true
+ * @param bankNames :: An optional bank name for loading specified banks
+ */
void LoadEventNexus::createSpectraMapping(
const std::string &nxsfile, const bool monitorsOnly,
const std::vector<std::string> &bankNames) {
@@ -1876,9 +1879,9 @@ void LoadEventNexus::createSpectraMapping(
//-----------------------------------------------------------------------------
/**
-* Returns whether the file contains monitors with events in them
-* @returns True if the file contains monitors with event data, false otherwise
-*/
+ * Returns whether the file contains monitors with events in them
+ * @returns True if the file contains monitors with event data, false otherwise
+ */
bool LoadEventNexus::hasEventMonitors() {
bool result(false);
// Determine whether to load histograms or events
@@ -1905,16 +1908,16 @@ bool LoadEventNexus::hasEventMonitors() {
}
/**
-* Load the Monitors from the NeXus file into an event workspace. A
-* new event workspace is created and associated to the data
-* workspace. The name of the new event workspace is contructed by
-* appending '_monitors' to the base workspace name.
-*
-* This is used when the property "MonitorsAsEvents" is enabled, and
-* there are monitors with events.
-*
-* @param prog :: progress reporter
-*/
+ * Load the Monitors from the NeXus file into an event workspace. A
+ * new event workspace is created and associated to the data
+ * workspace. The name of the new event workspace is contructed by
+ * appending '_monitors' to the base workspace name.
+ *
+ * This is used when the property "MonitorsAsEvents" is enabled, and
+ * there are monitors with events.
+ *
+ * @param prog :: progress reporter
+ */
void LoadEventNexus::runLoadMonitorsAsEvents(API::Progress *const prog) {
try {
// Note the reuse of the m_ws member variable below. Means I need to grab a
@@ -1980,13 +1983,13 @@ void LoadEventNexus::runLoadMonitorsAsEvents(API::Progress *const prog) {
//-----------------------------------------------------------------------------
/**
-* Load the Monitors from the NeXus file into a workspace. The original
-* workspace name is used and appended with _monitors.
-*
-* This is used when the property "MonitorsAsEvents" is not
-* enabled, and uses LoadNexusMonitors to load monitor data into a
-* Workspace2D.
-*/
+ * Load the Monitors from the NeXus file into a workspace. The original
+ * workspace name is used and appended with _monitors.
+ *
+ * This is used when the property "MonitorsAsEvents" is not
+ * enabled, and uses LoadNexusMonitors to load monitor data into a
+ * Workspace2D.
+ */
void LoadEventNexus::runLoadMonitors() {
std::string mon_wsname = this->getProperty("OutputWorkspace");
mon_wsname.append("_monitors");
@@ -2047,15 +2050,15 @@ void LoadEventNexus::runLoadMonitors() {
//
/**
-* Load a spectra mapping from the given file. This currently checks for the
-* existence of
-* an isis_vms_compat block in the file, if it exists it pulls out the spectra
-* mapping listed there
-* @param filename :: A filename
-* @param monitorsOnly :: If true then only the monitor spectra are loaded
-* @param entry_name :: name of the NXentry to open.
-* @returns True if the mapping was loaded or false if the block does not exist
-*/
+ * Load a spectra mapping from the given file. This currently checks for the
+ * existence of
+ * an isis_vms_compat block in the file, if it exists it pulls out the spectra
+ * mapping listed there
+ * @param filename :: A filename
+ * @param monitorsOnly :: If true then only the monitor spectra are loaded
+ * @param entry_name :: name of the NXentry to open.
+ * @returns True if the mapping was loaded or false if the block does not exist
+ */
bool LoadEventNexus::loadSpectraMapping(const std::string &filename,
const bool monitorsOnly,
const std::string &entry_name) {
@@ -2163,10 +2166,10 @@ bool LoadEventNexus::loadSpectraMapping(const std::string &filename,
}
/**
-* Set the filters on TOF.
-* @param monitors :: If true check the monitor properties else use the standard
-* ones
-*/
+ * Set the filters on TOF.
+ * @param monitors :: If true check the monitor properties else use the standard
+ * ones
+ */
void LoadEventNexus::setTimeFilters(const bool monitors) {
// Get the limits to the filter
std::string prefix("Filter");
@@ -2194,12 +2197,12 @@ void LoadEventNexus::setTimeFilters(const bool monitors) {
// ISIS event corrections
//-----------------------------------------------------------------------------
/**
-* Check if time_of_flight can be found in the file and load it
-*
-* @param WS :: The event workspace collection which events will be modified.
-* @param entry_name :: An NXentry tag in the file
-* @param classType :: The type of the events: either detector or monitor
-*/
+ * Check if time_of_flight can be found in the file and load it
+ *
+ * @param WS :: The event workspace collection which events will be modified.
+ * @param entry_name :: An NXentry tag in the file
+ * @param classType :: The type of the events: either detector or monitor
+ */
void LoadEventNexus::loadTimeOfFlight(EventWorkspaceCollection_sptr WS,
const std::string &entry_name,
const std::string &classType) {
@@ -2304,14 +2307,14 @@ void LoadEventNexus::loadTimeOfFlight(EventWorkspaceCollection_sptr WS,
//-----------------------------------------------------------------------------
/**
-* Load the time of flight data. file must have open the group containing
-* "time_of_flight" data set.
-* @param file :: The nexus file to read from.
-* @param WS :: The event workspace collection to write to.
-* @param binsName :: bins name
-* @param start_wi :: First workspace index to process
-* @param end_wi :: Last workspace index to process
-*/
+ * Load the time of flight data. file must have open the group containing
+ * "time_of_flight" data set.
+ * @param file :: The nexus file to read from.
+ * @param WS :: The event workspace collection to write to.
+ * @param binsName :: bins name
+ * @param start_wi :: First workspace index to process
+ * @param end_wi :: Last workspace index to process
+ */
void LoadEventNexus::loadTimeOfFlightData(::NeXus::File &file,
EventWorkspaceCollection_sptr WS,
const std::string &binsName,
@@ -2391,19 +2394,19 @@ void LoadEventNexus::loadTimeOfFlightData(::NeXus::File &file,
}
/**
-* Load information of the sample. It is valid only for ISIS it get the
-* information from the group isis_vms_compat.
-*
-* If it does not find this group, it assumes that there is nothing to do.
-* But, if the information is there, but not in the way it was expected, it
-* will log the occurrence.
-*
-* @note: It does essentially the same thing of the
-* method: LoadISISNexus2::loadSampleData
-*
-* @param file : handle to the nexus file
-* @param WS : pointer to the workspace
-*/
+ * Load information of the sample. It is valid only for ISIS it get the
+ * information from the group isis_vms_compat.
+ *
+ * If it does not find this group, it assumes that there is nothing to do.
+ * But, if the information is there, but not in the way it was expected, it
+ * will log the occurrence.
+ *
+ * @note: It does essentially the same thing of the
+ * method: LoadISISNexus2::loadSampleData
+ *
+ * @param file : handle to the nexus file
+ * @param WS : pointer to the workspace
+ */
void LoadEventNexus::loadSampleDataISIScompatibility(
::NeXus::File &file, EventWorkspaceCollection &WS) {
try {
@@ -2436,12 +2439,12 @@ void LoadEventNexus::loadSampleDataISIScompatibility(
}
/**
-* Check the validity of the optional spectrum range/list provided and identify
-*if partial data should be loaded.
-*
-* @param min :: The minimum spectrum number read from file
-* @param max :: The maximum spectrum number read from file
-*/
+ * Check the validity of the optional spectrum range/list provided and identify
+ *if partial data should be loaded.
+ *
+ * @param min :: The minimum spectrum number read from file
+ * @param max :: The maximum spectrum number read from file
+ */
void LoadEventNexus::createSpectraList(int32_t min, int32_t max) {
diff --git a/Framework/DataHandling/src/LoadEventPreNexus2.cpp b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
index d338d1417cec2960ad39ced7dda7ecf3d18e82ce..6d4d40f5fe5e4ed6704905b091310fa4fe801b3d 100644
--- a/Framework/DataHandling/src/LoadEventPreNexus2.cpp
+++ b/Framework/DataHandling/src/LoadEventPreNexus2.cpp
@@ -16,7 +16,7 @@
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/CPUTimer.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/FileValidator.h"
#include "MantidKernel/Glob.h"
#include "MantidKernel/InstrumentInfo.h"
@@ -39,6 +39,8 @@
#include <Poco/File.h>
#include <Poco/Path.h>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace DataHandling {
@@ -991,7 +993,7 @@ void LoadEventPreNexus2::procEventsLinear(
// Storages
std::map<PixelType, size_t> local_pidindexmap;
- std::vector<std::vector<Kernel::DateAndTime>> local_pulsetimes;
+ std::vector<std::vector<Mantid::Types::DateAndTime>> local_pulsetimes;
std::vector<std::vector<double>> local_tofs;
std::set<PixelType> local_wrongdetids;
@@ -1089,7 +1091,7 @@ void LoadEventPreNexus2::procEventsLinear(
size_t newindex = local_pulsetimes.size();
local_pidindexmap[pid] = newindex;
- std::vector<Kernel::DateAndTime> tempvectime;
+ std::vector<Mantid::Types::DateAndTime> tempvectime;
std::vector<double> temptofs;
local_pulsetimes.push_back(tempvectime);
local_tofs.push_back(temptofs);
@@ -1138,7 +1140,7 @@ void LoadEventPreNexus2::procEventsLinear(
size_t newindex = this->wrongdetid_pulsetimes.size();
this->wrongdetidmap[tmpid] = newindex;
- std::vector<Kernel::DateAndTime> temppulsetimes;
+ std::vector<Mantid::Types::DateAndTime> temppulsetimes;
std::vector<double> temptofs;
this->wrongdetid_pulsetimes.push_back(temppulsetimes);
this->wrongdetid_tofs.push_back(temptofs);
diff --git a/Framework/DataHandling/src/LoadFullprofResolution.cpp b/Framework/DataHandling/src/LoadFullprofResolution.cpp
index cb0e15e01287afd33a56ae11450e397fa30c3717..6f2c878642cf9c6e09ebf70b701bb0586b5d645c 100644
--- a/Framework/DataHandling/src/LoadFullprofResolution.cpp
+++ b/Framework/DataHandling/src/LoadFullprofResolution.cpp
@@ -784,7 +784,7 @@ void LoadFullprofResolution::putParametersIntoWorkspace(
writer.setOptions(XMLWriter::PRETTY_PRINT);
// Get current time
- Kernel::DateAndTime date = Kernel::DateAndTime::getCurrentTime();
+ Mantid::Types::DateAndTime date = Mantid::Types::DateAndTime::getCurrentTime();
std::string ISOdate = date.toISO8601String();
std::string ISOdateShort =
ISOdate.substr(0, 19); // Remove fraction of seconds
diff --git a/Framework/DataHandling/src/LoadIDFFromNexus.cpp b/Framework/DataHandling/src/LoadIDFFromNexus.cpp
index 74305f3eedfbe26a71f97511f9b6c905e52a2abd..a18d2c961255cd4ed9ffc102b7004956cd109462 100644
--- a/Framework/DataHandling/src/LoadIDFFromNexus.cpp
+++ b/Framework/DataHandling/src/LoadIDFFromNexus.cpp
@@ -3,22 +3,24 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Strings.h"
-#include <Poco/DOM/Document.h>
#include <Poco/DOM/DOMParser.h>
+#include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
#include <Poco/DOM/NodeIterator.h>
+#include <Poco/DOM/NodeList.h>
#include <Poco/File.h>
#include <Poco/Path.h>
#include <nexus/NeXusFile.hpp>
+using Mantid::Types::DateAndTime;
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::Element;
-using Poco::XML::NodeList;
using Poco::XML::NodeIterator;
+using Poco::XML::NodeList;
namespace Mantid {
namespace DataHandling {
@@ -151,7 +153,7 @@ void LoadIDFFromNexus::exec() {
* @param instName :: short name of instrument as it appears in IDF filename
* etc.
* @returns full path name of correction file if found else ""
-*/
+ */
std::string
LoadIDFFromNexus::getParameterCorrectionFile(const std::string &instName) {
@@ -179,18 +181,18 @@ LoadIDFFromNexus::getParameterCorrectionFile(const std::string &instName) {
}
/* Reads the parameter correction file and if a correction is needed output the
-*parameterfile needed
-* and whether it is to be appended.
-* @param correction_file :: path nsame of correction file as returned by
-*getParameterCorrectionFile()
-* @param date :: IS8601 date string applicable: Must be full timestamp (timezone
-*optional)
-* @param parameter_file :: output parameter file to use or "" if none
-* @param append :: output whether the parameters from parameter_file should be
-*appended.
-*
-* @throw FileError Thrown if unable to parse XML file
-*/
+ *parameterfile needed
+ * and whether it is to be appended.
+ * @param correction_file :: path nsame of correction file as returned by
+ *getParameterCorrectionFile()
+ * @param date :: IS8601 date string applicable: Must be full timestamp
+ *(timezone optional)
+ * @param parameter_file :: output parameter file to use or "" if none
+ * @param append :: output whether the parameters from parameter_file should be
+ *appended.
+ *
+ * @throw FileError Thrown if unable to parse XML file
+ */
void LoadIDFFromNexus::readParameterCorrectionFile(
const std::string &correction_file, const std::string &date,
std::string ¶meter_file, bool &append) {
@@ -233,7 +235,8 @@ void LoadIDFFromNexus::readParameterCorrectionFile(
// Convert date to Mantid object
g_log.notice() << "Date for correction file " << date << "\n";
- DateAndTime externalDate(date);
+ DateAndTime externalDate =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(date);
// Examine the XML structure obtained by parsing
Poco::AutoPtr<NodeList> correctionNodeList =
@@ -242,8 +245,10 @@ void LoadIDFFromNexus::readParameterCorrectionFile(
// For each correction element
Element *corr = dynamic_cast<Element *>(correctionNodeList->item(i));
if (corr) {
- DateAndTime start(corr->getAttribute("valid-from"));
- DateAndTime end(corr->getAttribute("valid-to"));
+ auto start = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ corr->getAttribute("valid-from"));
+ auto end = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ corr->getAttribute("valid-to"));
if (start <= externalDate && externalDate <= end) {
parameter_file = corr->getAttribute("file");
append = (corr->getAttribute("append") == "true");
diff --git a/Framework/DataHandling/src/LoadILLDiffraction.cpp b/Framework/DataHandling/src/LoadILLDiffraction.cpp
index c6e8b01f078beebecc8d281cd36193300aeaff6b..a98133205a6a82e40eb2f5801eb2599cd40f24d9 100644
--- a/Framework/DataHandling/src/LoadILLDiffraction.cpp
+++ b/Framework/DataHandling/src/LoadILLDiffraction.cpp
@@ -1,6 +1,4 @@
#include "MantidDataHandling/LoadILLDiffraction.h"
-#include "MantidGeometry/Instrument/ComponentInfo.h"
-#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/RegisterFileLoader.h"
@@ -8,18 +6,22 @@
#include "MantidDataHandling/H5Util.h"
#include "MantidDataObjects/ScanningWorkspaceBuilder.h"
#include "MantidGeometry/Instrument/ComponentHelper.h"
+#include "MantidGeometry/Instrument/ComponentInfo.h"
+#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/make_unique.h"
+#include "MantidTypes/DateAndTime.h"
#include <boost/algorithm/string/predicate.hpp>
#include <numeric>
#include <H5Cpp.h>
-#include <nexus/napi.h>
#include <Poco/Path.h>
+#include <nexus/napi.h>
+
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace DataHandling {
@@ -42,7 +44,7 @@ constexpr size_t NUMBER_MONITORS = 1;
// This is the angular size of a pixel in degrees (in low resolution mode)
constexpr double D20_PIXEL_SIZE = 0.1;
constexpr double rad2deg = 180. / M_PI;
-}
+} // namespace
// Register the algorithm into the AlgorithmFactory
DECLARE_NEXUS_FILELOADER_ALGORITHM(LoadILLDiffraction)
@@ -116,8 +118,8 @@ void LoadILLDiffraction::exec() {
}
/**
-* Loads the scanned detector data
-*/
+ * Loads the scanned detector data
+ */
void LoadILLDiffraction::loadDataScan() {
// open the root entry
@@ -126,7 +128,7 @@ void LoadILLDiffraction::loadDataScan() {
m_instName = firstEntry.getString("instrument/name");
- m_startTime = DateAndTime(
+ m_startTime = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
m_loadHelper.dateTimeInIsoFormat(firstEntry.getString("start_time")));
// read the detector data
@@ -188,8 +190,8 @@ void LoadILLDiffraction::loadDataScan() {
}
/**
-* Dumps the metadata from the whole file to SampleLogs
-*/
+ * Dumps the metadata from the whole file to SampleLogs
+ */
void LoadILLDiffraction::loadMetaData() {
m_outWorkspace->mutableRun().addProperty("Facility", std::string("ILL"));
@@ -248,7 +250,8 @@ void LoadILLDiffraction::initMovingWorkspace(const NXDouble &scan) {
g_log.debug() << "Last time index ends at:"
<< (m_startTime + std::accumulate(timeDurations.begin(),
timeDurations.end(), 0.0))
- .toISO8601String() << "\n";
+ .toISO8601String()
+ << "\n";
// Angles in the NeXus files are the absolute position for tube 1
std::vector<double> tubeAngles =
@@ -642,8 +645,8 @@ void LoadILLDiffraction::resolveInstrument() {
}
/**
-* Runs LoadInstrument as child to link the non-moving instrument to workspace
-*/
+ * Runs LoadInstrument as child to link the non-moving instrument to workspace
+ */
void LoadILLDiffraction::loadStaticInstrument() {
IAlgorithm_sptr loadInst = createChildAlgorithm("LoadInstrument");
loadInst->setPropertyValue("Filename", getInstrumentFilePath(m_instName));
@@ -667,9 +670,9 @@ MatrixWorkspace_sptr LoadILLDiffraction::loadEmptyInstrument() {
}
/**
-* Rotates the detector to the 2theta0 read from the file
-* @param twoTheta0Read : 2theta0 read from the file
-*/
+ * Rotates the detector to the 2theta0 read from the file
+ * @param twoTheta0Read : 2theta0 read from the file
+ */
void LoadILLDiffraction::moveTwoThetaZero(double twoTheta0Read) {
Instrument_const_sptr instrument = m_outWorkspace->getInstrument();
IComponent_const_sptr component = instrument->getComponentByName("detector");
@@ -686,11 +689,11 @@ void LoadILLDiffraction::moveTwoThetaZero(double twoTheta0Read) {
}
/**
-* Makes up the full path of the relevant IDF dependent on resolution mode
-* @param instName : the name of the instrument (including the resolution mode
-* suffix)
-* @return : the full path to the corresponding IDF
-*/
+ * Makes up the full path of the relevant IDF dependent on resolution mode
+ * @param instName : the name of the instrument (including the resolution mode
+ * suffix)
+ * @return : the full path to the corresponding IDF
+ */
std::string
LoadILLDiffraction::getInstrumentFilePath(const std::string &instName) const {
diff --git a/Framework/DataHandling/src/LoadLog.cpp b/Framework/DataHandling/src/LoadLog.cpp
index ef50c84e5dc1932428b161d2a2e7a57986c3d3b2..10ca08f21615d88afe948dcc5707b75a374a837b 100644
--- a/Framework/DataHandling/src/LoadLog.cpp
+++ b/Framework/DataHandling/src/LoadLog.cpp
@@ -6,6 +6,7 @@
#include "MantidAPI/FileProperty.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Glob.h"
#include "MantidKernel/LogParser.h"
#include "MantidKernel/PropertyWithValue.h"
@@ -24,6 +25,8 @@
#include <fstream> // used to get ifstream
#include <sstream>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace DataHandling {
// Register the algorithm into the algorithm factory
@@ -201,7 +204,8 @@ void LoadLog::loadThreeColumnLogFile(std::ifstream &logFileStream,
std::map<std::string, std::unique_ptr<Kernel::TimeSeriesProperty<double>>>
dMap;
std::map<std::string,
- std::unique_ptr<Kernel::TimeSeriesProperty<std::string>>> sMap;
+ std::unique_ptr<Kernel::TimeSeriesProperty<std::string>>>
+ sMap;
kind l_kind(LoadLog::empty);
bool isNumeric(false);
diff --git a/Framework/DataHandling/src/LoadMuonNexus2.cpp b/Framework/DataHandling/src/LoadMuonNexus2.cpp
index d1ef00c8e59a857b014d200eb7c109b4d446f565..3d2d69078659f7cd87a9d0f86bdfa4e3adb806c9 100644
--- a/Framework/DataHandling/src/LoadMuonNexus2.cpp
+++ b/Framework/DataHandling/src/LoadMuonNexus2.cpp
@@ -17,16 +17,17 @@
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/UnitLabelTypes.h"
#include "MantidNexus/NexusClasses.h"
-#include <nexus/NeXusFile.hpp>
-#include <nexus/NeXusException.hpp>
-
#include <Poco/Path.h>
#include <boost/lexical_cast.hpp>
#include <boost/shared_ptr.hpp>
+#include <nexus/NeXusException.hpp>
+#include <nexus/NeXusFile.hpp>
#include <cmath>
#include <numeric>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace DataHandling {
// Register the algorithm into the algorithm factory
@@ -40,16 +41,17 @@ using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::Counts;
using Mantid::HistogramData::Histogram;
using namespace Mantid::NeXus;
+using namespace Mantid::Types;
/// Empty default constructor
LoadMuonNexus2::LoadMuonNexus2() : LoadMuonNexus() {}
/** Executes the right version of the muon nexus loader: versions 1 or 2.
-*
-* @throw Exception::FileError If the Nexus file cannot be found/opened
-* @throw std::invalid_argument If the optional properties are set to invalid
-*values
-*/
+ *
+ * @throw Exception::FileError If the Nexus file cannot be found/opened
+ * @throw std::invalid_argument If the optional properties are set to invalid
+ *values
+ */
void LoadMuonNexus2::exec() {
std::string filePath = getPropertyValue("Filename");
LoadMuonNexus1 load1;
@@ -81,11 +83,11 @@ void LoadMuonNexus2::exec() {
}
/** Read in a muon nexus file of the version 2.
-*
-* @throw Exception::FileError If the Nexus file cannot be found/opened
-* @throw std::invalid_argument If the optional properties are set to invalid
-*values
-*/
+ *
+ * @throw Exception::FileError If the Nexus file cannot be found/opened
+ * @throw std::invalid_argument If the optional properties are set to invalid
+ *values
+ */
void LoadMuonNexus2::doExec() {
// Create the root Nexus class
NXRoot root(getPropertyValue("Filename"));
@@ -299,8 +301,8 @@ void LoadMuonNexus2::doExec() {
}
/** loadData
-* Load the counts data from an NXInt into a workspace
-*/
+ * Load the counts data from an NXInt into a workspace
+ */
Histogram LoadMuonNexus2::loadData(const BinEdges &edges,
const Mantid::NeXus::NXInt &counts,
int period, int spec) {
@@ -321,11 +323,11 @@ Histogram LoadMuonNexus2::loadData(const BinEdges &edges,
}
/** Load logs from Nexus file. Logs are expected to be in
-* /run/sample group of the file.
-* @param ws :: The workspace to load the logs to.
-* @param entry :: The Nexus entry
-* @param period :: The period of this workspace
-*/
+ * /run/sample group of the file.
+ * @param ws :: The workspace to load the logs to.
+ * @param entry :: The Nexus entry
+ * @param period :: The period of this workspace
+ */
void LoadMuonNexus2::loadLogs(API::MatrixWorkspace_sptr ws, NXEntry &entry,
int period) {
// Avoid compiler warning
@@ -361,8 +363,8 @@ void LoadMuonNexus2::loadLogs(API::MatrixWorkspace_sptr ws, NXEntry &entry,
}
/** Log the run details from the file
-* @param localWorkspace :: The workspace details to use
-*/
+ * @param localWorkspace :: The workspace details to use
+ */
void LoadMuonNexus2::loadRunDetails(
DataObjects::Workspace2D_sptr localWorkspace) {
API::Run &runDetails = localWorkspace->mutableRun();
diff --git a/Framework/DataHandling/src/LoadNexusLogs.cpp b/Framework/DataHandling/src/LoadNexusLogs.cpp
index 0632a705fa9ef49cb73b25bfc59fc0ceca1b8190..7bd99a97c7799d1dd6c9fc9f6e035f064e6a6aa5 100644
--- a/Framework/DataHandling/src/LoadNexusLogs.cpp
+++ b/Framework/DataHandling/src/LoadNexusLogs.cpp
@@ -1,18 +1,21 @@
#include "MantidDataHandling/LoadNexusLogs.h"
-#include <nexus/NeXusException.hpp>
-#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/ArrayProperty.h"
#include "MantidAPI/FileProperty.h"
#include "MantidAPI/Run.h"
+#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/TimeSeriesProperty.h"
#include <locale>
+#include <nexus/NeXusException.hpp>
-#include <Poco/Path.h>
+#include <Poco/DateTimeFormat.h>
#include <Poco/DateTimeFormatter.h>
#include <Poco/DateTimeParser.h>
-#include <Poco/DateTimeFormat.h>
+#include <Poco/Path.h>
-#include <boost/scoped_array.hpp>
#include "MantidDataHandling/LoadTOFRawNexus.h"
+#include <boost/scoped_array.hpp>
+
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace DataHandling {
@@ -20,10 +23,11 @@ namespace DataHandling {
DECLARE_ALGORITHM(LoadNexusLogs)
using namespace Kernel;
-using API::WorkspaceProperty;
+using namespace Types;
+using API::FileProperty;
using API::MatrixWorkspace;
using API::MatrixWorkspace_sptr;
-using API::FileProperty;
+using API::WorkspaceProperty;
using std::size_t;
// Anonymous namespace
@@ -72,11 +76,11 @@ bool loadAndApplyMeasurementInfo(::NeXus::File *const file,
}
/**
-* @brief loadAndApplyRunTitle
-* @param file : Nexus::File pointer
-* @param workspace : Pointer to the workspace to set logs on
-* @return True only if reading and execution successful.
-*/
+ * @brief loadAndApplyRunTitle
+ * @param file : Nexus::File pointer
+ * @param workspace : Pointer to the workspace to set logs on
+ * @return True only if reading and execution successful.
+ */
bool loadAndApplyRunTitle(::NeXus::File *const file,
API::MatrixWorkspace &workspace) {
@@ -95,18 +99,18 @@ bool loadAndApplyRunTitle(::NeXus::File *const file,
}
/**
-* Checks whether the specified character is invalid or a control
-* character. If it is invalid (i.e. negative) or a control character
-* the method returns true. If it is valid and not a control character
-* it returns false. Additionally if the character is invalid is
-* logs a warning with the property name so users are aware.
-*
-* @param c :: Character to check
-* @param propName :: The name of the property currently being checked for
-*logging
-* @param log :: Reference to logger to print out to
-* @return :: True if control character OR invalid. Else False
-*/
+ * Checks whether the specified character is invalid or a control
+ * character. If it is invalid (i.e. negative) or a control character
+ * the method returns true. If it is valid and not a control character
+ * it returns false. Additionally if the character is invalid is
+ * logs a warning with the property name so users are aware.
+ *
+ * @param c :: Character to check
+ * @param propName :: The name of the property currently being checked for
+ *logging
+ * @param log :: Reference to logger to print out to
+ * @return :: True if control character OR invalid. Else False
+ */
bool isControlValue(const char &c, const std::string &propName,
Kernel::Logger &log) {
// Have to check it falls within range accepted by c style check
@@ -148,12 +152,12 @@ void LoadNexusLogs::init() {
}
/** Executes the algorithm. Reading in the file and creating and populating
-* the output workspace
-*
-* @throw Exception::FileError If the Nexus file cannot be found/opened
-* @throw std::invalid_argument If the optional properties are set to invalid
-*values
-*/
+ * the output workspace
+ *
+ * @throw Exception::FileError If the Nexus file cannot be found/opened
+ * @throw std::invalid_argument If the optional properties are set to invalid
+ *values
+ */
void LoadNexusLogs::exec() {
std::string filename = getPropertyValue("Filename");
MatrixWorkspace_sptr workspace = getProperty("Workspace");
@@ -282,10 +286,10 @@ void LoadNexusLogs::exec() {
Kernel::TimeSeriesProperty<double> *pcharge =
new Kernel::TimeSeriesProperty<double>("proton_charge");
std::vector<double> pval;
- std::vector<Mantid::Kernel::DateAndTime> ptime;
+ std::vector<Mantid::Types::DateAndTime> ptime;
pval.reserve(event_frame_number.size());
ptime.reserve(event_frame_number.size());
- std::vector<Mantid::Kernel::DateAndTime> plogt = plog->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> plogt = plog->timesAsVector();
std::vector<double> plogv = plog->valuesAsVector();
for (auto number : event_frame_number) {
ptime.push_back(plogt[number]);
@@ -299,10 +303,10 @@ void LoadNexusLogs::exec() {
try {
// Read the start and end time strings
file.openData("start_time");
- Kernel::DateAndTime start(file.getStrData());
+ auto start = DateAndTimeHelpers::createFromISO8601(file.getStrData());
file.closeData();
file.openData("end_time");
- Kernel::DateAndTime end(file.getStrData());
+ auto end = DateAndTimeHelpers::createFromISO8601(file.getStrData());
file.closeData();
workspace->mutableRun().setStartAndEndTime(start, end);
} catch (::NeXus::Exception &) {
@@ -356,7 +360,7 @@ void LoadNexusLogs::loadVetoPulses(
// Load the start date/time as ISO8601 string.
std::string start_time;
file.getAttr("start_time", start_time);
- DateAndTime start(start_time);
+ DateAndTime start = DateAndTimeHelpers::createFromISO8601(start_time);
// Read the offsets
std::vector<double> time_double;
@@ -607,7 +611,8 @@ LoadNexusLogs::createTimeSeries(::NeXus::File &file,
}
// Convert to date and time
- Kernel::DateAndTime start_time = Kernel::DateAndTime(start);
+ Mantid::Types::DateAndTime start_time =
+ DateAndTimeHelpers::createFromISO8601(start);
std::string time_units;
file.getAttr("units", time_units);
if (time_units.compare("second") < 0 && time_units != "s" &&
@@ -684,9 +689,10 @@ LoadNexusLogs::createTimeSeries(::NeXus::File &file,
}
// The string may contain non-printable (i.e. control) characters, replace
// these
- std::replace_if(values.begin(), values.end(), [&](const char &c) {
- return isControlValue(c, prop_name, g_log);
- }, ' ');
+ std::replace_if(
+ values.begin(), values.end(),
+ [&](const char &c) { return isControlValue(c, prop_name, g_log); },
+ ' ');
auto tsp = new TimeSeriesProperty<std::string>(prop_name);
std::vector<DateAndTime> times;
DateAndTime::createVector(start_time, time_double, times);
diff --git a/Framework/DataHandling/src/LoadNexusMonitors2.cpp b/Framework/DataHandling/src/LoadNexusMonitors2.cpp
index e061969627b8b7f4f0ff330e449d63c895d4f5d0..74c96f4a33fd521fafcd710873a33cd2c467c566 100644
--- a/Framework/DataHandling/src/LoadNexusMonitors2.cpp
+++ b/Framework/DataHandling/src/LoadNexusMonitors2.cpp
@@ -8,7 +8,7 @@
#include "MantidDataHandling/ISISRunLogs.h"
#include "MantidDataHandling/LoadEventNexus.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/UnitFactory.h"
@@ -111,9 +111,9 @@ void LoadNexusMonitors2::init() {
//------------------------------------------------------------------------------
/**
-* Executes the algorithm. Reading in the file and creating and populating
-* the output workspace
-*/
+ * Executes the algorithm. Reading in the file and creating and populating
+ * the output workspace
+ */
void LoadNexusMonitors2::exec() {
// Retrieve the filename from the properties
m_filename = this->getPropertyValue("Filename");
@@ -329,7 +329,7 @@ void LoadNexusMonitors2::exec() {
// Old SNS files don't have this
try {
// The run_start will be loaded from the pulse times.
- Kernel::DateAndTime run_start(0, 0);
+ Mantid::Types::DateAndTime run_start(0, 0);
run_start = m_workspace->getFirstPulseTime();
m_workspace->mutableRun().addProperty("run_start",
run_start.toISO8601String(), true);
@@ -368,12 +368,12 @@ void LoadNexusMonitors2::exec() {
//------------------------------------------------------------------------------
/**
-* Can we get a histogram (non event data) for every monitor?
-*
-* @param file :: NeXus file object (open)
-* @param monitorNames :: names of monitors of interest
-* @return If there seems to be histograms for all monitors (they have "data")
-**/
+ * Can we get a histogram (non event data) for every monitor?
+ *
+ * @param file :: NeXus file object (open)
+ * @param monitorNames :: names of monitors of interest
+ * @return If there seems to be histograms for all monitors (they have "data")
+ **/
bool LoadNexusMonitors2::allMonitorsHaveHistoData(
::NeXus::File &file, const std::vector<std::string> &monitorNames) {
bool res = true;
@@ -394,14 +394,14 @@ bool LoadNexusMonitors2::allMonitorsHaveHistoData(
//------------------------------------------------------------------------------
/**
-* Fix the detector numbers if the defaults are not correct. Currently checks
-* the isis_vms_compat block and reads them from there if possible.
-*
-* @param det_ids :: An array of prefilled detector IDs
-* @param file :: A reference to the NeXus file opened at the root entry
-* @param spec_ids :: An array of spectrum numbers that the monitors have
-* @param nmonitors :: The size of the det_ids and spec_ids arrays
-*/
+ * Fix the detector numbers if the defaults are not correct. Currently checks
+ * the isis_vms_compat block and reads them from there if possible.
+ *
+ * @param det_ids :: An array of prefilled detector IDs
+ * @param file :: A reference to the NeXus file opened at the root entry
+ * @param spec_ids :: An array of spectrum numbers that the monitors have
+ * @param nmonitors :: The size of the det_ids and spec_ids arrays
+ */
void LoadNexusMonitors2::fixUDets(
boost::scoped_array<detid_t> &det_ids, ::NeXus::File &file,
const boost::scoped_array<specnum_t> &spec_ids,
@@ -461,11 +461,11 @@ void LoadNexusMonitors2::runLoadLogs(const std::string filename,
//------------------------------------------------------------------------------
/**
-* Helper method to make sure that a file is / can be openend as a NeXus file
-*
-* @param fname :: name of the file
-* @return True if opening the file as NeXus and retrieving entries succeeds
-**/
+ * Helper method to make sure that a file is / can be openend as a NeXus file
+ *
+ * @param fname :: name of the file
+ * @return True if opening the file as NeXus and retrieving entries succeeds
+ **/
bool LoadNexusMonitors2::canOpenAsNeXus(const std::string &fname) {
bool res = true;
::NeXus::File *f = nullptr;
@@ -485,11 +485,11 @@ bool LoadNexusMonitors2::canOpenAsNeXus(const std::string &fname) {
//------------------------------------------------------------------------------
/**
-* Splits multiperiod histogram data into seperate workspaces and puts them in
-* a group
-*
-* @param numPeriods :: number of periods
-**/
+ * Splits multiperiod histogram data into seperate workspaces and puts them in
+ * a group
+ *
+ * @param numPeriods :: number of periods
+ **/
void LoadNexusMonitors2::splitMutiPeriodHistrogramData(
const size_t numPeriods) {
// protection - we should not have entered the routine if these are not true
@@ -626,16 +626,16 @@ size_t LoadNexusMonitors2::getMonitorInfo(
}
/** Create output workspace
-* @brief LoadNexusMonitors2::createOutputWorkspace
-* @param numHistMon
-* @param numEventMon
-* @param monitorsAsEvents
-* @param monitorNames
-* @param isEventMonitors
-* @param monitorNumber2Name
-* @param loadMonitorFlags
-* @return
-*/
+ * @brief LoadNexusMonitors2::createOutputWorkspace
+ * @param numHistMon
+ * @param numEventMon
+ * @param monitorsAsEvents
+ * @param monitorNames
+ * @param isEventMonitors
+ * @param monitorNumber2Name
+ * @param loadMonitorFlags
+ * @return
+ */
bool LoadNexusMonitors2::createOutputWorkspace(
size_t numHistMon, size_t numEventMon, bool monitorsAsEvents,
std::vector<std::string> &monitorNames, std::vector<bool> &isEventMonitors,
@@ -796,7 +796,7 @@ void LoadNexusMonitors2::readEventMonitorEntry(NeXus::File &file, size_t i) {
file.closeData();
file.openData("event_time_zero");
file.getDataCoerce(seconds);
- Mantid::Kernel::DateAndTime pulsetime_offset;
+ Mantid::Types::DateAndTime pulsetime_offset;
{
std::string startTime;
file.getAttr("offset", startTime);
@@ -807,8 +807,8 @@ void LoadNexusMonitors2::readEventMonitorEntry(NeXus::File &file, size_t i) {
// load up the event list
DataObjects::EventList &event_list = eventWS->getSpectrum(i);
- Mantid::Kernel::DateAndTime pulsetime(0);
- Mantid::Kernel::DateAndTime lastpulsetime(0);
+ Mantid::Types::DateAndTime pulsetime(0);
+ Mantid::Types::DateAndTime lastpulsetime(0);
std::size_t numEvents = time_of_flight.size();
bool pulsetimesincreasing = true;
size_t pulse_index(0);
diff --git a/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Framework/DataHandling/src/LoadNexusProcessed.cpp
index 77786d10da951bf9f4575b3d4a77de3c88ed46ec..d1ae7fab3f4b008a70526f9ae47c79cb4d2e2fef 100644
--- a/Framework/DataHandling/src/LoadNexusProcessed.cpp
+++ b/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -20,7 +20,7 @@
#include "MantidGeometry/Instrument/Goniometer.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/BoundedValidator.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/MultiThreaded.h"
#include "MantidKernel/StringTokenizer.h"
#include "MantidKernel/UnitFactory.h"
@@ -38,6 +38,8 @@
#include <string>
#include <vector>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/LoadRawHelper.cpp b/Framework/DataHandling/src/LoadRawHelper.cpp
index c9d19ba5474cbbe5689e3ea95754c523014fd296..cdb7d33c29c58bd9e775d29572631a3598146997 100644
--- a/Framework/DataHandling/src/LoadRawHelper.cpp
+++ b/Framework/DataHandling/src/LoadRawHelper.cpp
@@ -11,6 +11,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Glob.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/OptionalBool.h"
@@ -22,11 +23,11 @@
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/shared_ptr.hpp>
+#include <Poco/DateTimeFormat.h>
+#include <Poco/DateTimeParser.h>
+#include <Poco/DirectoryIterator.h>
#include <Poco/File.h>
#include <Poco/Path.h>
-#include <Poco/DirectoryIterator.h>
-#include <Poco/DateTimeParser.h>
-#include <Poco/DateTimeFormat.h>
#include <cmath>
#include <cstdio> //Required for gcc 4.4
@@ -36,6 +37,7 @@ namespace DataHandling {
using namespace Kernel;
using namespace API;
+using namespace Types;
/// Constructor
LoadRawHelper::LoadRawHelper()
@@ -377,8 +379,8 @@ void LoadRawHelper::setWorkspaceProperty(const std::string &propertyName,
*/
void LoadRawHelper::setWorkspaceData(
DataObjects::Workspace2D_sptr newWorkspace,
- const std::vector<boost::shared_ptr<HistogramData::HistogramX>> &
- timeChannelsVec,
+ const std::vector<boost::shared_ptr<HistogramData::HistogramX>>
+ &timeChannelsVec,
int64_t wsIndex, specnum_t nspecNum, int64_t noTimeRegimes,
int64_t lengthIn, int64_t binStart) {
if (!newWorkspace)
@@ -839,14 +841,14 @@ void LoadRawHelper::loadRunParameters(API::MatrixWorkspace_sptr localWorkspace,
* @param isisRaw: pointer to the raw file
* @return the endtime
*/
-Kernel::DateAndTime LoadRawHelper::extractEndTime(ISISRAW *isisRaw) {
+Mantid::Types::DateAndTime LoadRawHelper::extractEndTime(ISISRAW *isisRaw) {
std::string isisDate = std::string(isisRaw->rpb.r_enddate, 11);
if (isisDate[0] == ' ')
isisDate[0] = '0';
- return DateAndTime(isisDate.substr(7, 4) + "-" +
- convertMonthLabelToIntStr(isisDate.substr(3, 3)) + "-" +
- isisDate.substr(0, 2) + "T" +
- std::string(isisRaw->rpb.r_endtime, 8));
+ return DateAndTimeHelpers::createFromISO8601(
+ isisDate.substr(7, 4) + "-" +
+ convertMonthLabelToIntStr(isisDate.substr(3, 3)) + "-" +
+ isisDate.substr(0, 2) + "T" + std::string(isisRaw->rpb.r_endtime, 8));
}
/**
@@ -854,14 +856,14 @@ Kernel::DateAndTime LoadRawHelper::extractEndTime(ISISRAW *isisRaw) {
* @param isisRaw: pointer to the raw file
* @return the start time
*/
-Kernel::DateAndTime LoadRawHelper::extractStartTime(ISISRAW *isisRaw) {
+Mantid::Types::DateAndTime LoadRawHelper::extractStartTime(ISISRAW *isisRaw) {
auto isisDate = std::string(isisRaw->hdr.hd_date, 11);
if (isisDate[0] == ' ')
isisDate[0] = '0';
- return DateAndTime(isisDate.substr(7, 4) + "-" +
- convertMonthLabelToIntStr(isisDate.substr(3, 3)) + "-" +
- isisDate.substr(0, 2) + "T" +
- std::string(isisRaw->hdr.hd_time, 8));
+ return DateAndTimeHelpers::createFromISO8601(
+ isisDate.substr(7, 4) + "-" +
+ convertMonthLabelToIntStr(isisDate.substr(3, 3)) + "-" +
+ isisDate.substr(0, 2) + "T" + std::string(isisRaw->hdr.hd_time, 8));
}
/// To help transforming date stored in ISIS raw file into iso 8601
@@ -1089,9 +1091,8 @@ void LoadRawHelper::loadSpectra(
for (specnum_t i = 1; i <= m_numberOfSpectra; ++i) {
int64_t histToRead = i + periodTimesNSpectraP1;
if ((i >= m_spec_min && i < m_spec_max) ||
- (m_list &&
- find(m_spec_list.begin(), m_spec_list.end(), i) !=
- m_spec_list.end())) {
+ (m_list && find(m_spec_list.begin(), m_spec_list.end(), i) !=
+ m_spec_list.end())) {
progress(m_prog, "Reading raw file data...");
// read spectrum from raw file
@@ -1105,9 +1106,9 @@ void LoadRawHelper::loadSpectra(
if (numberOfPeriods == 1) {
if (++histCurrent % 100 == 0) {
- m_prog = progStart +
- (progEnd - progStart) *
- (static_cast<double>(histCurrent) / histTotal);
+ m_prog =
+ progStart + (progEnd - progStart) *
+ (static_cast<double>(histCurrent) / histTotal);
}
interruption_point();
}
diff --git a/Framework/DataHandling/src/LoadSpice2D.cpp b/Framework/DataHandling/src/LoadSpice2D.cpp
index 04096230e33114217af96c9348b82ed5c73dd46e..4275c379827dbaba109998cef95b62230c294bc4 100644
--- a/Framework/DataHandling/src/LoadSpice2D.cpp
+++ b/Framework/DataHandling/src/LoadSpice2D.cpp
@@ -10,46 +10,48 @@
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/BoundedValidator.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/UnitFactory.h"
-#include <boost/regex.hpp>
-#include <boost/shared_array.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/make_shared.hpp>
+#include <boost/regex.hpp>
+#include <boost/shared_array.hpp>
#include <boost/shared_ptr.hpp>
-#include <Poco/Path.h>
#include <MantidKernel/StringTokenizer.h>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h>
-#include <Poco/DOM/NodeList.h>
#include <Poco/DOM/Node.h>
+#include <Poco/DOM/NodeList.h>
#include <Poco/DOM/Text.h>
+#include <Poco/Path.h>
#include <Poco/SAX/InputSource.h>
#include <algorithm>
#include <iostream>
#include <sstream>
#include <string>
-#include <vector>
#include <utility>
+#include <vector>
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::Element;
-using Poco::XML::NodeList;
using Poco::XML::Node;
+using Poco::XML::NodeList;
using Poco::XML::Text;
namespace Mantid {
namespace DataHandling {
-using Mantid::Kernel::Direction;
using Mantid::API::WorkspaceProperty;
+using Mantid::Kernel::Direction;
+using namespace Mantid::Types;
using namespace Kernel;
using namespace API;
using namespace Geometry;
@@ -285,7 +287,8 @@ void LoadSpice2D::setWavelength(std::map<std::string, std::string> &metadata) {
// 20160720: New wavelength will be a ratio
// HUGLY HACK! Comparing dates...
- DateAndTime changingDate("2016-06-13 00:00:00");
+ auto changingDate =
+ DateAndTimeHelpers::createFromISO8601("2016-06-13 00:00:00");
if (m_startTime >= changingDate) {
g_log.debug() << "Using wavelength spread as a ratio" << '\n';
m_dwavelength = m_wavelength * m_dwavelength;
@@ -492,8 +495,8 @@ void LoadSpice2D::setTimes() {
std::map<std::string, std::string> attributes =
m_xmlHandler.get_attributes_from_tag("/");
- m_startTime = DateAndTime(attributes["start_time"]);
- m_endTime = DateAndTime(attributes["end_time"]);
+ m_startTime = DateAndTimeHelpers::createFromISO8601(attributes["start_time"]);
+ m_endTime = DateAndTimeHelpers::createFromISO8601(attributes["end_time"]);
}
void LoadSpice2D::setMetadataAsRunProperties(
@@ -763,5 +766,5 @@ void LoadSpice2D::setSansSpiceXmlFormatVersion(
g_log.debug() << "Sans_spice_xml_format_version == "
<< m_sansSpiceXmlFormatVersion << "\n";
}
-}
-}
+} // namespace DataHandling
+} // namespace Mantid
diff --git a/Framework/DataHandling/src/LoadSpiceAscii.cpp b/Framework/DataHandling/src/LoadSpiceAscii.cpp
index e966d0031d725cf83d8f032b4e505f9ab5c47ae3..ec8f12b1eb63b1ca3fc5c2bd58a1040b5c53a016 100644
--- a/Framework/DataHandling/src/LoadSpiceAscii.cpp
+++ b/Framework/DataHandling/src/LoadSpiceAscii.cpp
@@ -1,20 +1,20 @@
-#include <fstream>
#include <boost/algorithm/string.hpp>
+#include <fstream>
-#include "MantidDataHandling/LoadSpiceAscii.h"
-#include "MantidAPI/FileProperty.h"
#include "MantidAPI/FileLoaderRegistry.h"
+#include "MantidAPI/FileProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceProperty.h"
+#include "MantidDataHandling/LoadSpiceAscii.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
-#include <boost/algorithm/string/iter_find.hpp>
#include <boost/algorithm/string/finder.hpp>
+#include <boost/algorithm/string/iter_find.hpp>
using namespace boost::algorithm;
@@ -22,6 +22,8 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace DataHandling {
@@ -138,7 +140,7 @@ void LoadSpiceAscii::init() {
//----------------------------------------------------------------------------------------------
/** Exec
- */
+ */
void LoadSpiceAscii::exec() {
// Input properties and validate
std::string filename = getPropertyValue("Filename");
@@ -441,8 +443,8 @@ void LoadSpiceAscii::setupRunStartTime(
// Parse property vector
if (datetimeprop.size() != 4) {
g_log.warning() << "Run start date and time property must contain 4 "
- "strings. User only specifies " << datetimeprop.size()
- << ". Set up failed."
+ "strings. User only specifies "
+ << datetimeprop.size() << ". Set up failed."
<< "\n";
return;
}
@@ -473,7 +475,8 @@ void LoadSpiceAscii::setupRunStartTime(
std::string mtddatetimestr = mtddatestring + "T" + mtdtimestring;
// Set up property
- DateAndTime runstart(mtddatetimestr);
+ auto runstart =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(mtddatetimestr);
addProperty<std::string>(runinfows, "run_start", runstart.toISO8601String());
}
diff --git a/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp b/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
index f8eda027c8d1960e700628c4e700621d8d0eb0f5..e79da6a475a8fd7825c22715c458bc4a5bbe2ce0 100644
--- a/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
+++ b/Framework/DataHandling/src/LoadSpiceXML2DDet.cpp
@@ -274,7 +274,7 @@ bool LoadSpiceXML2DDet::setupSampleLogs(API::MatrixWorkspace_sptr outws) {
setupSampleLogFromSpiceTable(outws, spicetablews, m_ptNumber4Log);
}
- Kernel::DateAndTime anytime(1000);
+ Mantid::Types::DateAndTime anytime(1000);
// Process 2theta
bool return_true = true;
@@ -833,7 +833,7 @@ void LoadSpiceXML2DDet::setupSampleLogFromSpiceTable(
size_t numrows = spicetablews->rowCount();
std::vector<std::string> colnames = spicetablews->getColumnNames();
// FIXME - Shouldn't give a better value?
- Kernel::DateAndTime anytime(1000);
+ Mantid::Types::DateAndTime anytime(1000);
bool foundlog = false;
for (size_t ir = 0; ir < numrows; ++ir) {
diff --git a/Framework/DataHandling/src/MergeLogs.cpp b/Framework/DataHandling/src/MergeLogs.cpp
index b371ac206b0b5f977f42ab066075d46e7bf69bf0..de51774dc6bf911a7eb7042c97ca896b7e617d6f 100644
--- a/Framework/DataHandling/src/MergeLogs.cpp
+++ b/Framework/DataHandling/src/MergeLogs.cpp
@@ -69,8 +69,8 @@ void Merge2WorkspaceLogs::mergeLogs(std::string ilogname1,
Kernel::TimeSeriesProperty<double> *p1 = getTimeSeriesLog(ilogname1);
Kernel::TimeSeriesProperty<double> *p2 = getTimeSeriesLog(ilogname2);
- std::vector<Kernel::DateAndTime> times1 = p1->timesAsVector();
- std::vector<Kernel::DateAndTime> times2 = p2->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times1 = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times2 = p2->timesAsVector();
auto rp = new Kernel::TimeSeriesProperty<double>(ologname);
@@ -79,7 +79,7 @@ void Merge2WorkspaceLogs::mergeLogs(std::string ilogname1,
size_t index2 = 0;
bool icont = true;
- Kernel::DateAndTime tmptime;
+ Mantid::Types::DateAndTime tmptime;
double tmpvalue;
bool launch1 = true;
;
diff --git a/Framework/DataHandling/src/ProcessBankData.cpp b/Framework/DataHandling/src/ProcessBankData.cpp
index 8d5833cd9e16520f11c3d7ae117e2965577f064e..74cdec211a2bd87708948bddbe72981c150f85c7 100644
--- a/Framework/DataHandling/src/ProcessBankData.cpp
+++ b/Framework/DataHandling/src/ProcessBankData.cpp
@@ -73,10 +73,10 @@ void ProcessBankData::run() { // override {
}
// Default pulse time (if none are found)
- Mantid::Kernel::DateAndTime pulsetime;
+ Mantid::Types::DateAndTime pulsetime;
int periodNumber = 1;
int periodIndex = 0;
- Mantid::Kernel::DateAndTime lastpulsetime(0);
+ Mantid::Types::DateAndTime lastpulsetime(0);
bool pulsetimesincreasing = true;
diff --git a/Framework/DataHandling/src/RenameLog.cpp b/Framework/DataHandling/src/RenameLog.cpp
index c828a086867b6cd2d8f9c009add5cfd83b3968da..0e29d3fe5f078fd440a2bf3d7c191841ee824b4c 100644
--- a/Framework/DataHandling/src/RenameLog.cpp
+++ b/Framework/DataHandling/src/RenameLog.cpp
@@ -48,7 +48,7 @@ void RenameLog::exec() {
// std::cout << "Change log name\n";
timeprop->setName(newlogname);
// std::cout << "Add log" << timeprop->name() << '\n';
- // std::vector<Kernel::DateAndTime> newtimes = timeprop->timesAsVector();
+ // std::vector<Mantid::Types::DateAndTime> newtimes = timeprop->timesAsVector();
// std::cout << "Entries = " << newtimes.size() << '\n';
matrixWS->mutableRun().addProperty(timeprop);
}
diff --git a/Framework/DataHandling/src/SaveCalFile.cpp b/Framework/DataHandling/src/SaveCalFile.cpp
index 7baa585f620ebeac83d80495ea880fbbe16e4552..1ca32cf549261888cf136e6c77314c39e3748929 100644
--- a/Framework/DataHandling/src/SaveCalFile.cpp
+++ b/Framework/DataHandling/src/SaveCalFile.cpp
@@ -1,7 +1,8 @@
-#include "MantidAPI/FileProperty.h"
#include "MantidDataHandling/SaveCalFile.h"
-#include "MantidKernel/System.h"
+#include "MantidAPI/FileProperty.h"
#include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/System.h"
+#include "MantidTypes/DateAndTime.h"
#include <cmath>
#include <fstream>
@@ -10,6 +11,8 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace DataHandling {
@@ -150,5 +153,5 @@ void SaveCalFile::saveCalFile(const std::string &calFileName,
}
}
-} // namespace Mantid
} // namespace DataHandling
+} // namespace Mantid
diff --git a/Framework/DataHandling/src/SaveIsawDetCal.cpp b/Framework/DataHandling/src/SaveIsawDetCal.cpp
index 31385076e09324389b02586e580a0abcff06f36d..703b3a5e822dcc1972743937de02720c0d22e53b 100644
--- a/Framework/DataHandling/src/SaveIsawDetCal.cpp
+++ b/Framework/DataHandling/src/SaveIsawDetCal.cpp
@@ -18,6 +18,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Geometry;
using std::string;
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace DataHandling {
diff --git a/Framework/DataHandling/src/SaveNexus.cpp b/Framework/DataHandling/src/SaveNexus.cpp
index c2b74e2a5ea9102fe4a68aae6846b71c6bce26a9..4a2505c04c8c0d2bfe3c41c209d70c2e0fc02f71 100644
--- a/Framework/DataHandling/src/SaveNexus.cpp
+++ b/Framework/DataHandling/src/SaveNexus.cpp
@@ -142,7 +142,7 @@ void SaveNexus::runSaveNexusProcessed() {
// If we're tracking history, add the entry before we save it to file
if (trackingHistory()) {
m_history->fillAlgorithmHistory(
- this, Mantid::Kernel::DateAndTime::getCurrentTime(), 0,
+ this, Mantid::Types::DateAndTime::getCurrentTime(), 0,
Algorithm::g_execCount);
if (!isChild()) {
m_inputWorkspace->history().addHistory(m_history);
diff --git a/Framework/DataHandling/src/SaveNexusProcessed.cpp b/Framework/DataHandling/src/SaveNexusProcessed.cpp
index bd27a5e2d5b4e0f428fe13d80ac2049d4f64ed52..7cbe9333bb00340c3ec16e8e33f3620e46c1fe86 100644
--- a/Framework/DataHandling/src/SaveNexusProcessed.cpp
+++ b/Framework/DataHandling/src/SaveNexusProcessed.cpp
@@ -287,7 +287,7 @@ void SaveNexusProcessed::doExec(
// Switch to the Cpp API for the algorithm history
if (trackingHistory()) {
m_history->fillAlgorithmHistory(
- this, Mantid::Kernel::DateAndTime::getCurrentTime(), 0,
+ this, Mantid::Types::DateAndTime::getCurrentTime(), 0,
Algorithm::g_execCount);
if (!isChild()) {
inputWorkspace->history().addHistory(m_history);
diff --git a/Framework/DataHandling/src/StartAndEndTimeFromNexusFileExtractor.cpp b/Framework/DataHandling/src/StartAndEndTimeFromNexusFileExtractor.cpp
index 289abc173e6d25af61d66a789d6fdaa3936a8f5c..3f85bbf02772c851ce44ddbfcbeb8d4c1bc37215 100644
--- a/Framework/DataHandling/src/StartAndEndTimeFromNexusFileExtractor.cpp
+++ b/Framework/DataHandling/src/StartAndEndTimeFromNexusFileExtractor.cpp
@@ -1,6 +1,7 @@
+#include "MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h"
#include "MantidAPI/FileFinder.h"
#include "MantidDataHandling/LoadNexus.h"
-#include "MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
#include "MantidNexus/NexusClasses.h"
@@ -18,45 +19,51 @@ namespace DataHandling {
enum class NexusType { Muon, Processed, ISIS, TofRaw };
enum class TimeType : unsigned char { StartTime, EndTime };
-Mantid::Kernel::DateAndTime handleMuonNexusFile(TimeType type,
- std::string filename) {
+Mantid::Types::DateAndTime handleMuonNexusFile(TimeType type,
+ std::string filename) {
Mantid::NeXus::NXRoot root(filename);
if (type == TimeType::StartTime) {
- return Mantid::Kernel::DateAndTime(root.getString("run/start_time"));
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ root.getString("run/start_time"));
} else {
- return Mantid::Kernel::DateAndTime(root.getString("run/stop_time"));
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ root.getString("run/stop_time"));
}
}
-Mantid::Kernel::DateAndTime handleProcessedNexusFile(TimeType type,
- std::string filename) {
+Mantid::Types::DateAndTime handleProcessedNexusFile(TimeType type,
+ std::string filename) {
Mantid::NeXus::NXRoot root(filename);
if (type == TimeType::StartTime) {
- return Mantid::Kernel::DateAndTime(
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
root.getString("mantid_workspace_1/logs/run_start/value"));
} else {
- return Mantid::Kernel::DateAndTime(
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
root.getString("mantid_workspace_1/logs/run_end/value"));
}
}
-Mantid::Kernel::DateAndTime handleISISNexusFile(TimeType type,
- std::string filename) {
+Mantid::Types::DateAndTime handleISISNexusFile(TimeType type,
+ std::string filename) {
Mantid::NeXus::NXRoot root(filename);
if (type == TimeType::StartTime) {
- return Mantid::Kernel::DateAndTime(root.getString("raw_data_1/start_time"));
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ root.getString("raw_data_1/start_time"));
} else {
- return Mantid::Kernel::DateAndTime(root.getString("raw_data_1/end_time"));
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ root.getString("raw_data_1/end_time"));
}
}
-Mantid::Kernel::DateAndTime handleTofRawNexusFile(TimeType type,
- std::string filename) {
+Mantid::Types::DateAndTime handleTofRawNexusFile(TimeType type,
+ std::string filename) {
Mantid::NeXus::NXRoot root(filename);
if (type == TimeType::StartTime) {
- return Mantid::Kernel::DateAndTime(root.getString("entry/start_time"));
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ root.getString("entry/start_time"));
} else {
- return Mantid::Kernel::DateAndTime(root.getString("entry/end_time"));
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ root.getString("entry/end_time"));
}
}
@@ -104,13 +111,13 @@ NexusType whichNexusType(std::string filename) {
return nexusType;
}
-Mantid::Kernel::DateAndTime extractDateAndTime(TimeType type,
- std::string filename) {
+Mantid::Types::DateAndTime extractDateAndTime(TimeType type,
+ std::string filename) {
auto fullFileName = Mantid::API::FileFinder::Instance().getFullPath(filename);
// Figure out the type of the Nexus file. We need to handle them individually
// since they store the datetime differently
auto nexusType = whichNexusType(fullFileName);
- Mantid::Kernel::DateAndTime dateAndTime;
+ Mantid::Types::DateAndTime dateAndTime;
switch (nexusType) {
case NexusType::Muon:
@@ -139,7 +146,7 @@ Mantid::Kernel::DateAndTime extractDateAndTime(TimeType type,
* @return the start time
* @throws if the the start time cannot be extracted
*/
-Mantid::Kernel::DateAndTime extractStartTime(const std::string &filename) {
+Mantid::Types::DateAndTime extractStartTime(const std::string &filename) {
return extractDateAndTime(TimeType::StartTime, filename);
}
@@ -149,7 +156,7 @@ Mantid::Kernel::DateAndTime extractStartTime(const std::string &filename) {
* @return the start time
* @throws if the the start time cannot be extracted
*/
-Mantid::Kernel::DateAndTime extractEndTime(const std::string &filename) {
+Mantid::Types::DateAndTime extractEndTime(const std::string &filename) {
return extractDateAndTime(TimeType::EndTime, filename);
}
diff --git a/Framework/DataHandling/test/GroupDetectors2Test.h b/Framework/DataHandling/test/GroupDetectors2Test.h
index eb1f6d8214c6f595a4ce2a54a317f6bcd90818a4..2304821a6f5049b681c52fb2cc5e39388060e428 100644
--- a/Framework/DataHandling/test/GroupDetectors2Test.h
+++ b/Framework/DataHandling/test/GroupDetectors2Test.h
@@ -16,7 +16,7 @@
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidHistogramData/LinearGenerator.h"
#include "MantidIndexing/IndexInfo.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidTestHelpers/HistogramDataTestHelper.h"
#include "MantidTypes/SpectrumDefinition.h"
@@ -979,7 +979,7 @@ private:
timeRanges.push_back(double(i + 1));
}
- builder.setTimeRanges(Mantid::Kernel::DateAndTime(0), timeRanges);
+ builder.setTimeRanges(Mantid::Types::DateAndTime(0), timeRanges);
return builder.buildWorkspace();
}
diff --git a/Framework/DataHandling/test/LoadEventNexusTest.h b/Framework/DataHandling/test/LoadEventNexusTest.h
index 5b5ba885452107f768333e7a91d870399c3ad972..afb98cf00b973d24cae75e668b9a78ddda3a8717 100644
--- a/Framework/DataHandling/test/LoadEventNexusTest.h
+++ b/Framework/DataHandling/test/LoadEventNexusTest.h
@@ -8,10 +8,11 @@
#include "MantidAPI/Run.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidAPI/Workspace.h"
+#include "MantidDataHandling/LoadEventNexus.h"
#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Property.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidDataHandling/LoadEventNexus.h"
#include <cxxtest/TestSuite.h>
using namespace Mantid::Geometry;
@@ -19,6 +20,7 @@ using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
+using namespace Mantid::Types;
class LoadEventNexusTest : public CxxTest::TestSuite {
private:
@@ -472,8 +474,9 @@ public:
1.426, 1e-6);
// Check monitor workspace pointer held in main workspace
- TS_ASSERT_EQUALS(WS, ads.retrieveWS<MatrixWorkspace>("cncs_compressed")
- ->monitorWorkspace());
+ TS_ASSERT_EQUALS(
+ WS,
+ ads.retrieveWS<MatrixWorkspace>("cncs_compressed")->monitorWorkspace());
}
void doTestSingleBank(bool SingleBankPixelsOnly, bool Precount,
@@ -554,7 +557,7 @@ public:
auto ws = AnalysisDataService::Instance().retrieveWS<EventWorkspace>(outws);
auto inst = ws->getInstrument();
TS_ASSERT_EQUALS(inst->getName(), "HYSPECA");
- TS_ASSERT_EQUALS(inst->getValidFromDate(),
+ TS_ASSERT_EQUALS(inst->getValidFromDate().toSimpleString(),
std::string("2011-Jul-20 17:02:48.437294000"));
TS_ASSERT_EQUALS(inst->getNumberDetectors(), 20483);
TS_ASSERT_EQUALS(inst->baseInstrument()->getMonitors().size(), 3);
diff --git a/Framework/DataHandling/test/LoadEventPreNexus2Test.h b/Framework/DataHandling/test/LoadEventPreNexus2Test.h
index 1b2b1a7175dd4281ad4847c9890adcc9d66cfbf7..a5feed58d876f98d797aea0cc235207c255fd9f2 100644
--- a/Framework/DataHandling/test/LoadEventPreNexus2Test.h
+++ b/Framework/DataHandling/test/LoadEventPreNexus2Test.h
@@ -20,7 +20,7 @@
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <sys/stat.h>
@@ -32,12 +32,13 @@ using namespace Mantid::Kernel;
using namespace Mantid::Kernel::Exception;
using namespace Mantid::API;
using namespace Mantid::Geometry;
+using namespace Mantid::Types;
using Mantid::HistogramData::HistogramX;
+using std::cout;
using std::runtime_error;
using std::size_t;
using std::vector;
-using std::cout;
//==========================================================================================
class LoadEventPreNexus2Test : public CxxTest::TestSuite {
@@ -130,7 +131,7 @@ public:
std::map<DateAndTime, double> logMap = log->valueAsMap();
std::map<DateAndTime, double>::iterator it, it2;
it = logMap.begin();
- Kernel::DateAndTime start = it->first;
+ Mantid::Types::DateAndTime start = it->first;
std::vector<TofEvent> events1 = ew->getSpectrum(1000).getEvents();
for (size_t i = 0; i < events1.size(); i++) {
diff --git a/Framework/DataHandling/test/LoadInstrumentTest.h b/Framework/DataHandling/test/LoadInstrumentTest.h
index 4cdd97f88f78248d4f2ef943b9c9634ca634f8bb..bfa33f9f3f1e257fa86b7888740083aa2c981236 100644
--- a/Framework/DataHandling/test/LoadInstrumentTest.h
+++ b/Framework/DataHandling/test/LoadInstrumentTest.h
@@ -3,7 +3,6 @@
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/Axis.h"
-#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/InstrumentDataService.h"
#include "MantidAPI/SpectrumInfo.h"
@@ -11,8 +10,10 @@
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidGeometry/Instrument/FitParameter.h"
#include "MantidHistogramData/LinearGenerator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/Strings.h"
@@ -23,13 +24,14 @@
#include <vector>
using namespace Mantid;
+using namespace Mantid::Types;
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
-using Mantid::HistogramData::Points;
using Mantid::HistogramData::LinearGenerator;
+using Mantid::HistogramData::Points;
class LoadInstrumentTest : public CxxTest::TestSuite {
public:
@@ -163,8 +165,10 @@ public:
TS_ASSERT_EQUALS(output->getInstrument()->baseInstrument(), i);
// Valid-from/to1951-01-01 00:00:01
- Kernel::DateAndTime validFrom("1951-01-01T00:00:01");
- Kernel::DateAndTime validTo("2100-01-31 23:59:59");
+ DateAndTime validFrom =
+ DateAndTimeHelpers::createFromISO8601("1951-01-01T00:00:01");
+ DateAndTime validTo =
+ DateAndTimeHelpers::createFromISO8601("2100-01-31 23:59:59");
TS_ASSERT_EQUALS(i->getValidFromDate(), validFrom);
TS_ASSERT_EQUALS(i->getValidToDate(), validTo);
diff --git a/Framework/DataHandling/test/LoadLogTest.h b/Framework/DataHandling/test/LoadLogTest.h
index 6b0c4ec43259ff75313537662c478ca154ebf944..76a2e82d02217371050bd82b3e33a7b2d4672217 100644
--- a/Framework/DataHandling/test/LoadLogTest.h
+++ b/Framework/DataHandling/test/LoadLogTest.h
@@ -173,7 +173,7 @@ public:
Property *prop = 0;
TimeSeriesProperty<double> *tsp;
std::vector<double> vals;
- std::vector<DateAndTime> times;
+ std::vector<Mantid::Types::DateAndTime> times;
TS_ASSERT_THROWS_NOTHING(prop = output->run().getLogData("Temp1"));
tsp = dynamic_cast<TimeSeriesProperty<double> *>(prop);
diff --git a/Framework/DataHandling/test/LoadMuonNexus2Test.h b/Framework/DataHandling/test/LoadMuonNexus2Test.h
index f2144b8d6bdffd9dc779ca6483c0f1d0a5432693..31e34da8716d6181c1507af177945fe6a42430ad 100644
--- a/Framework/DataHandling/test/LoadMuonNexus2Test.h
+++ b/Framework/DataHandling/test/LoadMuonNexus2Test.h
@@ -25,6 +25,7 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
+using Mantid::Types::DateAndTime;
using Mantid::detid_t;
class LoadMuonNexus2Test : public CxxTest::TestSuite {
diff --git a/Framework/DataHandling/test/LoadNexusLogsTest.h b/Framework/DataHandling/test/LoadNexusLogsTest.h
index 0bd34d15f5c36e7dc922b10bbf6dba6f5518469f..3ab35a3d0bd1aa6b08ebaaf8974f27b750f7e922 100644
--- a/Framework/DataHandling/test/LoadNexusLogsTest.h
+++ b/Framework/DataHandling/test/LoadNexusLogsTest.h
@@ -1,16 +1,17 @@
#ifndef LOADNEXUSLOGSTEST_H_
#define LOADNEXUSLOGSTEST_H_
-#include "MantidDataHandling/LoadNexusLogs.h"
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidAPI/FrameworkManager.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/Workspace.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidDataHandling/LoadNexusLogs.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/PhysicalConstants.h"
+#include "MantidKernel/TimeInterval.h"
+#include "MantidKernel/TimeSeriesProperty.h"
using namespace Mantid;
using namespace Mantid::Geometry;
@@ -18,8 +19,8 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
-#include <cxxtest/TestSuite.h>
#include "MantidAPI/WorkspaceGroup.h"
+#include <cxxtest/TestSuite.h>
class LoadNexusLogsTest : public CxxTest::TestSuite {
public:
@@ -64,9 +65,9 @@ public:
TS_ASSERT_DELTA(tsp->nthValue(1), 13715.55, 2);
// The time diff between the 0th and 1st entry is 0.328 seconds
- TS_ASSERT_DELTA(
- Kernel::DateAndTime::secondsFromDuration(tsp->nthInterval(0).length()),
- 0.328, 0.01);
+ TS_ASSERT_DELTA(Mantid::Types::DateAndTime::secondsFromDuration(
+ tsp->nthInterval(0).length()),
+ 0.328, 0.01);
// Now the stats
}
diff --git a/Framework/DataHandling/test/LoadRaw3Test.h b/Framework/DataHandling/test/LoadRaw3Test.h
index 9e5653484f40c19166aa1fbfcafceff2b419616f..37a47837af86bc8e7d42d965da35bf23ad5d68dc 100644
--- a/Framework/DataHandling/test/LoadRaw3Test.h
+++ b/Framework/DataHandling/test/LoadRaw3Test.h
@@ -1,15 +1,15 @@
#ifndef LoadRaw3TEST_H_
#define LoadRaw3TEST_H_
-#include "MantidAPI/Axis.h"
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidGeometry/Instrument/DetectorInfo.h"
+#include "MantidAPI/Axis.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidDataHandling/LoadRaw3.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Detector.h"
+#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/Unit.h"
@@ -22,6 +22,7 @@ using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
+using Mantid::Types::DateAndTime;
class LoadRaw3Test : public CxxTest::TestSuite {
public:
diff --git a/Framework/DataHandling/test/MergeLogsTest.h b/Framework/DataHandling/test/MergeLogsTest.h
index 2505be16c0275284792ce3e12eff9b46efbda343..aa7023454ad9c0e91b3c39bbd38679faab190d72 100644
--- a/Framework/DataHandling/test/MergeLogsTest.h
+++ b/Framework/DataHandling/test/MergeLogsTest.h
@@ -9,7 +9,7 @@
#include "MantidAPI/Run.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidDataHandling/MergeLogs.h"
@@ -54,13 +54,13 @@ public:
size_t num2 = 12;
for (size_t i = 0; i < num1; i++) {
- Kernel::DateAndTime time(t1_ns);
+ Mantid::Types::DateAndTime time(t1_ns);
p1->addValue(time, v1);
t1_ns += dt_ns;
}
for (size_t i = 0; i < num2; i++) {
- Kernel::DateAndTime time(t2_ns);
+ Mantid::Types::DateAndTime time(t2_ns);
p2->addValue(time, v2);
t2_ns += dt_ns;
}
@@ -94,9 +94,9 @@ public:
TS_ASSERT_EQUALS(mergprop->size(), p1->size() + p2->size());
- std::vector<Kernel::DateAndTime> mergedtimes = mergprop->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> mergedtimes = mergprop->timesAsVector();
for (size_t i = 0; i < 2 * num1; i++) {
- Kernel::DateAndTime logtime = mergedtimes[i];
+ Mantid::Types::DateAndTime logtime = mergedtimes[i];
double logvalue = mergprop->getSingleValue(logtime);
if (i % 2 == 0) {
TS_ASSERT_DELTA(logvalue, -1.0, 0.001);
@@ -106,7 +106,7 @@ public:
} // ENDFOR
for (size_t i = 2 * num1; i < num1 + num2; i++) {
- Kernel::DateAndTime logtime = mergedtimes[i];
+ Mantid::Types::DateAndTime logtime = mergedtimes[i];
double logvalue = mergprop->getSingleValue(logtime);
TS_ASSERT_DELTA(logvalue, 1.0, 0.001);
}
diff --git a/Framework/DataHandling/test/RemoveLogsTest.h b/Framework/DataHandling/test/RemoveLogsTest.h
index 33f4f7762a2d59222932c71bdb52a08a5a44657d..271e22b890cc9e0df4f43d6e687d227f48334338 100644
--- a/Framework/DataHandling/test/RemoveLogsTest.h
+++ b/Framework/DataHandling/test/RemoveLogsTest.h
@@ -3,17 +3,18 @@
#include <cxxtest/TestSuite.h>
-#include "MantidDataHandling/RemoveLogs.h"
-#include "MantidDataHandling/LoadLog.h"
-#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidGeometry/Instrument.h"
-#include "MantidDataObjects/Workspace2D.h"
+#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidKernel/Exception.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/Workspace.h"
-#include "MantidAPI/Algorithm.h"
+#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidDataHandling/LoadLog.h"
+#include "MantidDataHandling/RemoveLogs.h"
+#include "MantidDataObjects/Workspace2D.h"
+#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Component.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/Exception.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -23,6 +24,7 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
class RemoveLogsTest : public CxxTest::TestSuite {
public:
@@ -124,7 +126,8 @@ private:
std::vector<DateAndTime> times;
std::vector<int> index;
std::vector<double> dbl1, dbl2;
- DateAndTime startTime("2010-01-01T00:00:00");
+ DateAndTime startTime =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
for (int i = 0; i < 100; ++i) {
times.push_back(startTime + i * 10.0);
index.push_back(i);
diff --git a/Framework/DataHandling/test/RenameLogTest.h b/Framework/DataHandling/test/RenameLogTest.h
index 56d1ead62dd403d5fd105ee80d2e7fd87e25a6fb..2566304aec54510d41966d30ef1b4227ca674b1c 100644
--- a/Framework/DataHandling/test/RenameLogTest.h
+++ b/Framework/DataHandling/test/RenameLogTest.h
@@ -104,7 +104,7 @@ private:
m_rawValues.clear();
for (size_t i = 0; i < m_num1; i++) {
- Kernel::DateAndTime time(t1_ns);
+ Mantid::Types::DateAndTime time(t1_ns);
p1->addValue(time, v1);
m_rawTimes.push_back(time);
@@ -128,7 +128,7 @@ private:
rp = dynamic_cast<Kernel::TimeSeriesProperty<double> *>(
resultWS->run().getProperty(logName));
- std::vector<Kernel::DateAndTime> newtimes = rp->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> newtimes = rp->timesAsVector();
TS_ASSERT_EQUALS(newtimes.size(), m_num1);
for (size_t i = 0; i < m_num1; i++) {
double newvalue;
@@ -139,7 +139,7 @@ private:
}
size_t m_num1;
- std::vector<Kernel::DateAndTime> m_rawTimes;
+ std::vector<Mantid::Types::DateAndTime> m_rawTimes;
std::vector<double> m_rawValues;
};
diff --git a/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h b/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h
index 384c2b4e33033d74bd4e2f53864d3141dce1049f..9c14d2b12cd11849a018e16eb1b69ccb7cd0d0ec 100644
--- a/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h
+++ b/Framework/DataHandling/test/StartAndEndTimeFromNexusFileExtractorTest.h
@@ -5,8 +5,10 @@
#include "MantidAPI/FileFinder.h"
#include "MantidDataHandling/StartAndEndTimeFromNexusFileExtractor.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <string>
+using namespace Mantid::Types;
using namespace Mantid::DataHandling;
class StartAndEndTimeFromNexusFileExtractorTest : public CxxTest::TestSuite {
@@ -74,8 +76,10 @@ private:
auto endTimeExtracted = extractEndTime(fullFilePath);
// Assert
- Mantid::Kernel::DateAndTime expectedStartTimeString(startTime.c_str());
- Mantid::Kernel::DateAndTime expectedEndTimeString(endTime.c_str());
+ Mantid::Types::DateAndTime expectedStartTimeString =
+ DateAndTimeHelpers::createFromISO8601(startTime.c_str());
+ Mantid::Types::DateAndTime expectedEndTimeString =
+ DateAndTimeHelpers::createFromISO8601(endTime.c_str());
TSM_ASSERT("Should have the same start time",
startTimeExtracted == expectedStartTimeString);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/EventList.h b/Framework/DataObjects/inc/MantidDataObjects/EventList.h
index 1a64e6d16ffdb741d0c2a77eac38646e06409873..1426e3ba401de3cdc580052f01a186be77773c99 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/EventList.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/EventList.h
@@ -13,12 +13,15 @@
#include <vector>
namespace Mantid {
-namespace Kernel {
+namespace Types {
class DateAndTime;
+}
+namespace Kernel {
+
class SplittingInterval;
typedef std::vector<SplittingInterval> TimeSplitterType;
class Unit;
-}
+} // namespace Kernel
namespace DataObjects {
class EventWorkspaceMRU;
@@ -255,14 +258,14 @@ public:
void getTofs(std::vector<double> &tofs) const override;
double getTofMin() const override;
double getTofMax() const override;
- Mantid::Kernel::DateAndTime getPulseTimeMax() const override;
- Mantid::Kernel::DateAndTime getPulseTimeMin() const override;
- void getPulseTimeMinMax(Mantid::Kernel::DateAndTime &tMin,
- Mantid::Kernel::DateAndTime &tM) const;
- Mantid::Kernel::DateAndTime
+ Mantid::Types::DateAndTime getPulseTimeMax() const override;
+ Mantid::Types::DateAndTime getPulseTimeMin() const override;
+ void getPulseTimeMinMax(Mantid::Types::DateAndTime &tMin,
+ Mantid::Types::DateAndTime &tM) const;
+ Mantid::Types::DateAndTime
getTimeAtSampleMax(const double &tofFactor,
const double &tofOffset) const override;
- Mantid::Kernel::DateAndTime
+ Mantid::Types::DateAndTime
getTimeAtSampleMin(const double &tofFactor,
const double &tofOffset) const override;
@@ -278,18 +281,19 @@ public:
/// Return the list of event weight error values
void getWeightErrors(std::vector<double> &weightErrors) const override;
- std::vector<Mantid::Kernel::DateAndTime> getPulseTimes() const override;
+ std::vector<Mantid::Types::DateAndTime> getPulseTimes() const override;
void setTofs(const MantidVec &tofs) override;
void reverse();
- void filterByPulseTime(Kernel::DateAndTime start, Kernel::DateAndTime stop,
+ void filterByPulseTime(Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop,
EventList &output) const;
- void filterByTimeAtSample(Kernel::DateAndTime start, Kernel::DateAndTime stop,
- double tofFactor, double tofOffset,
- EventList &output) const;
+ void filterByTimeAtSample(Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop, double tofFactor,
+ double tofOffset, EventList &output) const;
void filterInPlace(Kernel::TimeSplitterType &splitter);
@@ -468,19 +472,21 @@ private:
template <class T>
static void
getPulseTimesHelper(const std::vector<T> &events,
- std::vector<Mantid::Kernel::DateAndTime> ×);
+ std::vector<Mantid::Types::DateAndTime> ×);
template <class T>
static void setTofsHelper(std::vector<T> &events,
const std::vector<double> &tofs);
template <class T>
- static void
- filterByPulseTimeHelper(std::vector<T> &events, Kernel::DateAndTime start,
- Kernel::DateAndTime stop, std::vector<T> &output);
+ static void filterByPulseTimeHelper(std::vector<T> &events,
+ Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop,
+ std::vector<T> &output);
template <class T>
- static void
- filterByTimeAtSampleHelper(std::vector<T> &events, Kernel::DateAndTime start,
- Kernel::DateAndTime stop, double tofFactor,
- double tofOffset, std::vector<T> &output);
+ static void filterByTimeAtSampleHelper(std::vector<T> &events,
+ Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop,
+ double tofFactor, double tofOffset,
+ std::vector<T> &output);
template <class T>
void filterInPlaceHelper(Kernel::TimeSplitterType &splitter,
typename std::vector<T> &events);
@@ -551,6 +557,6 @@ DLLExport void getEventsFrom(EventList &el,
DLLExport void getEventsFrom(const EventList &el,
std::vector<WeightedEventNoTime> const *&events);
-} // DataObjects
-} // Mantid
+} // namespace DataObjects
+} // namespace Mantid
#endif /// MANTID_DATAOBJECTS_EVENTLIST_H_
diff --git a/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
index 06290381e702145095699d510e401695ec412087..419e400b30b813393172dbb35a0438aabd3a29ad 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
@@ -76,15 +76,15 @@ public:
double getTofMax() const override;
- Mantid::Kernel::DateAndTime getPulseTimeMin() const override;
- Mantid::Kernel::DateAndTime getPulseTimeMax() const override;
- void getPulseTimeMinMax(Mantid::Kernel::DateAndTime &xmin,
- Mantid::Kernel::DateAndTime &xmax) const;
+ Mantid::Types::DateAndTime getPulseTimeMin() const override;
+ Mantid::Types::DateAndTime getPulseTimeMax() const override;
+ void getPulseTimeMinMax(Mantid::Types::DateAndTime &xmin,
+ Mantid::Types::DateAndTime &xmax) const;
- Mantid::Kernel::DateAndTime
+ Mantid::Types::DateAndTime
getTimeAtSampleMin(double tofOffset = 0) const override;
- Mantid::Kernel::DateAndTime
+ Mantid::Types::DateAndTime
getTimeAtSampleMax(double tofOffset = 0) const override;
double getEventXMin() const;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/Events.h b/Framework/DataObjects/inc/MantidDataObjects/Events.h
index daa7916ca5616224203e50ce1ec6f9ad18e1dd50..05af104f3514002b0198bc04570bafbaf1abd1f0 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/Events.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/Events.h
@@ -10,7 +10,7 @@
#include "MantidAPI/MatrixWorkspace_fwd.h" // get MantidVec declaration
#include "MantidKernel/cow_ptr.h"
#include "MantidKernel/System.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/TimeSplitter.h"
#include <set>
@@ -60,7 +60,7 @@ protected:
* 64 bits gives 1 ns resolution up to +- 292 years around 1990. Should be
*enough.
*/
- Mantid::Kernel::DateAndTime m_pulsetime;
+ Mantid::Types::DateAndTime m_pulsetime;
public:
/// Constructor, specifying only the time of flight in microseconds
@@ -68,7 +68,7 @@ public:
/// Constructor, specifying the time of flight in microseconds and the frame
/// id
- TofEvent(double tof, const Mantid::Kernel::DateAndTime pulsetime);
+ TofEvent(double tof, const Mantid::Types::DateAndTime pulsetime);
/// Empty constructor
TofEvent();
@@ -82,7 +82,7 @@ public:
double operator()() const;
double tof() const;
- Mantid::Kernel::DateAndTime pulseTime() const;
+ Mantid::Types::DateAndTime pulseTime() const;
double weight() const;
double error() const;
double errorSquared() const;
@@ -121,9 +121,9 @@ public:
WeightedEvent(double time_of_flight);
/// Constructor, full
- WeightedEvent(double tof, const Mantid::Kernel::DateAndTime pulsetime,
+ WeightedEvent(double tof, const Mantid::Types::DateAndTime pulsetime,
double weight, double errorSquared);
- WeightedEvent(double tof, const Mantid::Kernel::DateAndTime pulsetime,
+ WeightedEvent(double tof, const Mantid::Types::DateAndTime pulsetime,
float weight, float errorSquared);
WeightedEvent(const TofEvent &, double weight, double errorSquared);
@@ -182,9 +182,9 @@ public:
WeightedEventNoTime(double tof, double weight, double errorSquared);
WeightedEventNoTime(double tof, float weight, float errorSquared);
- WeightedEventNoTime(double tof, const Mantid::Kernel::DateAndTime pulsetime,
+ WeightedEventNoTime(double tof, const Mantid::Types::DateAndTime pulsetime,
double weight, double errorSquared);
- WeightedEventNoTime(double tof, const Mantid::Kernel::DateAndTime pulsetime,
+ WeightedEventNoTime(double tof, const Mantid::Types::DateAndTime pulsetime,
float weight, float errorSquared);
WeightedEventNoTime(const TofEvent &, double weight, double errorSquared);
@@ -204,7 +204,7 @@ public:
double operator()() const;
double tof() const;
- Mantid::Kernel::DateAndTime pulseTime() const;
+ Mantid::Types::DateAndTime pulseTime() const;
double weight() const;
double error() const;
double errorSquared() const;
@@ -231,7 +231,7 @@ inline double TofEvent::operator()() const { return m_tof; }
inline double TofEvent::tof() const { return m_tof; }
/// Return the pulse time
-inline Mantid::Kernel::DateAndTime TofEvent::pulseTime() const {
+inline Mantid::Types::DateAndTime TofEvent::pulseTime() const {
return m_pulsetime;
}
@@ -277,7 +277,7 @@ 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 Kernel::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; }
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
index 9d122261e5cbac7c2551c1ab99ab934c88b1c919..96610eaaa68f7320835cf79c8671a217a8775591 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
@@ -9,7 +9,7 @@
#include "MantidDataObjects/PeakColumn.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/Matrix.h"
diff --git a/Framework/DataObjects/inc/MantidDataObjects/ScanningWorkspaceBuilder.h b/Framework/DataObjects/inc/MantidDataObjects/ScanningWorkspaceBuilder.h
index 8e7aac1a1635bec45e767555911637533fed562a..fcf7878fcb56cb5e0d50bc667243ff47b112f092 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/ScanningWorkspaceBuilder.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/ScanningWorkspaceBuilder.h
@@ -4,7 +4,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidDataObjects/DllConfig.h"
#include "MantidIndexing/IndexInfo.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/V3D.h"
#include "MantidKernel/Quat.h"
@@ -64,9 +64,9 @@ public:
void setHistogram(HistogramData::Histogram histogram);
void
- setTimeRanges(std::vector<std::pair<Kernel::DateAndTime, Kernel::DateAndTime>>
+ setTimeRanges(std::vector<std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>>
timeRanges);
- void setTimeRanges(const Kernel::DateAndTime &startTime,
+ void setTimeRanges(const Mantid::Types::DateAndTime &startTime,
const std::vector<double> &durations);
void setPositions(std::vector<std::vector<Kernel::V3D>> positions);
void setRotations(std::vector<std::vector<Kernel::Quat>> rotations);
@@ -87,7 +87,7 @@ private:
HistogramData::Histogram m_histogram;
- std::vector<std::pair<Kernel::DateAndTime, Kernel::DateAndTime>> m_timeRanges;
+ std::vector<std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>> m_timeRanges;
std::vector<std::vector<Kernel::V3D>> m_positions;
std::vector<std::vector<Kernel::Quat>> m_rotations;
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index 64dd418bad5f778f723e338dadd2e63921ec7b79..60b9f895100c036e6c938b82107c2819fc794cc9 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -1,7 +1,7 @@
#include "MantidDataObjects/EventList.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidDataObjects/EventWorkspaceMRU.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/Unit.h"
@@ -29,7 +29,7 @@ using std::vector;
namespace Mantid {
namespace DataObjects {
using Kernel::Exception::NotImplementedError;
-using Kernel::DateAndTime;
+using Mantid::Types::DateAndTime;
using namespace Mantid::API;
namespace {
@@ -2713,7 +2713,7 @@ std::vector<double> EventList::getWeightErrors() const {
template <class T>
void EventList::getPulseTimesHelper(
const std::vector<T> &events,
- std::vector<Mantid::Kernel::DateAndTime> ×) {
+ std::vector<Mantid::Types::DateAndTime> ×) {
times.clear();
for (const auto &event : events) {
times.push_back(event.pulseTime());
@@ -2724,8 +2724,8 @@ void EventList::getPulseTimesHelper(
*
* @return by copy a vector of DateAndTime times
*/
-std::vector<Mantid::Kernel::DateAndTime> EventList::getPulseTimes() const {
- std::vector<Mantid::Kernel::DateAndTime> times;
+std::vector<Mantid::Types::DateAndTime> EventList::getPulseTimes() const {
+ std::vector<Mantid::Types::DateAndTime> times;
// Set the capacity of the vector to avoid multiple resizes
times.reserve(this->getNumberEvents());
@@ -2924,8 +2924,8 @@ DateAndTime EventList::getPulseTimeMax() const {
return tMax;
}
-void EventList::getPulseTimeMinMax(Mantid::Kernel::DateAndTime &tMin,
- Mantid::Kernel::DateAndTime &tMax) const {
+void EventList::getPulseTimeMinMax(Mantid::Types::DateAndTime &tMin,
+ Mantid::Types::DateAndTime &tMax) const {
// set up as the minimum available date time.
tMax = DateAndTime::minimum();
tMin = DateAndTime::maximum();
@@ -3620,8 +3620,8 @@ void EventList::filterByPulseTime(DateAndTime start, DateAndTime stop,
}
}
-void EventList::filterByTimeAtSample(Kernel::DateAndTime start,
- Kernel::DateAndTime stop, double tofFactor,
+void EventList::filterByTimeAtSample(Mantid::Types::DateAndTime start,
+ Mantid::Types::DateAndTime stop, double tofFactor,
double tofOffset,
EventList &output) const {
if (this == &output) {
@@ -4277,7 +4277,7 @@ void EventList::splitByPulseTimeHelper(Kernel::TimeSplitterType &splitter,
// Prepare to TimeSplitter Iterate through the splitter at the same time
auto itspl = splitter.begin();
auto itspl_end = splitter.end();
- Kernel::DateAndTime start, stop;
+ Mantid::Types::DateAndTime start, stop;
// Prepare to Events Iterate through all events (sorted by tof)
auto itev = events.begin();
diff --git a/Framework/DataObjects/src/EventWorkspace.cpp b/Framework/DataObjects/src/EventWorkspace.cpp
index 16300d5969243289626e0c27d6106def17a6ad21..5a9545c28f31335d954805872f0ca898d64a14c8 100644
--- a/Framework/DataObjects/src/EventWorkspace.cpp
+++ b/Framework/DataObjects/src/EventWorkspace.cpp
@@ -10,7 +10,7 @@
#include "MantidGeometry/IDetector.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/CPUTimer.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/FunctionTask.h"
#include "MantidKernel/IPropertyManager.h"
@@ -24,7 +24,7 @@
using namespace boost::posix_time;
using Mantid::API::ISpectrum;
-using Mantid::Kernel::DateAndTime;
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace DataObjects {
@@ -192,7 +192,7 @@ double EventWorkspace::getTofMax() const { return this->getEventXMax(); }
*/
DateAndTime EventWorkspace::getPulseTimeMin() const {
// set to crazy values to start
- Mantid::Kernel::DateAndTime tMin = DateAndTime::maximum();
+ Mantid::Types::DateAndTime tMin = DateAndTime::maximum();
size_t numWorkspace = this->data.size();
DateAndTime temp;
for (size_t workspaceIndex = 0; workspaceIndex < numWorkspace;
@@ -211,7 +211,7 @@ DateAndTime EventWorkspace::getPulseTimeMin() const {
*/
DateAndTime EventWorkspace::getPulseTimeMax() const {
// set to crazy values to start
- Mantid::Kernel::DateAndTime tMax = DateAndTime::minimum();
+ Mantid::Types::DateAndTime tMax = DateAndTime::minimum();
size_t numWorkspace = this->data.size();
DateAndTime temp;
for (size_t workspaceIndex = 0; workspaceIndex < numWorkspace;
@@ -229,8 +229,8 @@ Get the maximum and mimumum pulse time for events accross the entire workspace.
@param Tmax maximal pulse time as a DateAndTime.
*/
void EventWorkspace::getPulseTimeMinMax(
- Mantid::Kernel::DateAndTime &Tmin,
- Mantid::Kernel::DateAndTime &Tmax) const {
+ Mantid::Types::DateAndTime &Tmin,
+ Mantid::Types::DateAndTime &Tmax) const {
Tmax = DateAndTime::minimum();
Tmin = DateAndTime::maximum();
@@ -267,7 +267,7 @@ DateAndTime EventWorkspace::getTimeAtSampleMin(double tofOffset) const {
const auto L1 = specInfo.l1();
// set to crazy values to start
- Mantid::Kernel::DateAndTime tMin = DateAndTime::maximum();
+ Mantid::Types::DateAndTime tMin = DateAndTime::maximum();
size_t numWorkspace = this->data.size();
DateAndTime temp;
@@ -294,7 +294,7 @@ DateAndTime EventWorkspace::getTimeAtSampleMax(double tofOffset) const {
const auto L1 = specInfo.l1();
// set to crazy values to start
- Mantid::Kernel::DateAndTime tMax = DateAndTime::minimum();
+ Mantid::Types::DateAndTime tMax = DateAndTime::minimum();
size_t numWorkspace = this->data.size();
DateAndTime temp;
for (size_t workspaceIndex = 0; workspaceIndex < numWorkspace;
diff --git a/Framework/DataObjects/src/Events.cpp b/Framework/DataObjects/src/Events.cpp
index 778ff1d65fac989a5da3795a62d59e655918b39e..d7d2c5813d1ee19fe76491470ab8465967cc1a71 100644
--- a/Framework/DataObjects/src/Events.cpp
+++ b/Framework/DataObjects/src/Events.cpp
@@ -1,7 +1,7 @@
#include "MantidDataObjects/Events.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidDataObjects/EventList.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include <cmath>
#include <functional>
@@ -15,7 +15,7 @@ using std::vector;
namespace Mantid {
namespace DataObjects {
using Kernel::Exception::NotImplementedError;
-using Kernel::DateAndTime;
+using Mantid::Types::DateAndTime;
//==========================================================================
/// --------------------- TofEvent stuff ----------------------------------
@@ -108,7 +108,7 @@ WeightedEvent::WeightedEvent(double time_of_flight)
* @param errorSquared: the square of the error on the event
*/
WeightedEvent::WeightedEvent(double tof,
- const Mantid::Kernel::DateAndTime pulsetime,
+ const Mantid::Types::DateAndTime pulsetime,
double weight, double errorSquared)
: TofEvent(tof, pulsetime), m_weight(static_cast<float>(weight)),
m_errorSquared(static_cast<float>(errorSquared)) {}
@@ -120,7 +120,7 @@ WeightedEvent::WeightedEvent(double tof,
* @param errorSquared: the square of the error on the event
*/
WeightedEvent::WeightedEvent(double tof,
- const Mantid::Kernel::DateAndTime pulsetime,
+ const Mantid::Types::DateAndTime pulsetime,
float weight, float errorSquared)
: TofEvent(tof, pulsetime), m_weight(weight), m_errorSquared(errorSquared) {
}
@@ -238,7 +238,7 @@ WeightedEventNoTime::WeightedEventNoTime(double tof, float weight,
* @param errorSquared: the square of the error on the event
*/
WeightedEventNoTime::WeightedEventNoTime(double tof,
- const Mantid::Kernel::DateAndTime,
+ const Mantid::Types::DateAndTime,
double weight, double errorSquared)
: m_tof(tof), m_weight(static_cast<float>(weight)),
m_errorSquared(static_cast<float>(errorSquared)) {}
@@ -250,7 +250,7 @@ WeightedEventNoTime::WeightedEventNoTime(double tof,
* @param errorSquared: the square of the error on the event
*/
WeightedEventNoTime::WeightedEventNoTime(double tof,
- const Mantid::Kernel::DateAndTime,
+ const Mantid::Types::DateAndTime,
float weight, float errorSquared)
: m_tof(tof), m_weight(weight), m_errorSquared(errorSquared) {}
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index d38c71e134721f311ab3efe3b8022464955b96ca..dec6dfbae2878cb4410338610e3e9169d342e73a 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -11,7 +11,7 @@
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidGeometry/Instrument/Goniometer.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/PhysicalConstants.h"
#include "MantidKernel/Quat.h"
diff --git a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
index 8fd72b9c3dcd8fe75f7cb716b124267729802d20..f3bd097a830dfaf60586f646a837a6f1aa4d0d74 100644
--- a/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
+++ b/Framework/DataObjects/src/ScanningWorkspaceBuilder.cpp
@@ -62,7 +62,7 @@ void ScanningWorkspaceBuilder::setHistogram(
*and end times
*/
void ScanningWorkspaceBuilder::setTimeRanges(const std::vector<
- std::pair<Kernel::DateAndTime, Kernel::DateAndTime>> timeRanges) {
+ std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>> timeRanges) {
verifyTimeIndexSize(timeRanges.size(), "start time, end time pairs");
m_timeRanges = std::move(timeRanges);
}
@@ -75,18 +75,18 @@ void ScanningWorkspaceBuilder::setTimeRanges(const std::vector<
* @param durations A vector of doubles containing the duration in seconds
*/
void ScanningWorkspaceBuilder::setTimeRanges(
- const Kernel::DateAndTime &startTime,
+ const Mantid::Types::DateAndTime &startTime,
const std::vector<double> &durations) {
verifyTimeIndexSize(durations.size(), "time durations");
- std::vector<std::pair<Kernel::DateAndTime, Kernel::DateAndTime>> timeRanges =
- {std::pair<Kernel::DateAndTime, Kernel::DateAndTime>(
+ std::vector<std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>> timeRanges =
+ {std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>(
startTime, startTime + durations[0])};
for (size_t i = 1; i < m_nTimeIndexes; ++i) {
const auto newStartTime = timeRanges[i - 1].second;
const auto endTime = newStartTime + durations[i];
- timeRanges.push_back(std::pair<Kernel::DateAndTime, Kernel::DateAndTime>(
+ timeRanges.push_back(std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>(
newStartTime, endTime));
}
diff --git a/Framework/DataObjects/src/SplittersWorkspace.cpp b/Framework/DataObjects/src/SplittersWorkspace.cpp
index d2f33a3af621b4cd5264a3dfda01e8e1db68b61a..e73431f2b15c23c6fda3d77e3e94dd0a40a80e19 100644
--- a/Framework/DataObjects/src/SplittersWorkspace.cpp
+++ b/Framework/DataObjects/src/SplittersWorkspace.cpp
@@ -41,8 +41,8 @@ Kernel::SplittingInterval SplittersWorkspace::getSplitter(size_t index) {
row >> stop;
row >> wsgroup;
- Kernel::SplittingInterval splitter(Kernel::DateAndTime(start),
- Kernel::DateAndTime(stop), wsgroup);
+ Kernel::SplittingInterval splitter(Mantid::Types::DateAndTime(start),
+ Mantid::Types::DateAndTime(stop), wsgroup);
return splitter;
}
diff --git a/Framework/DataObjects/test/EventListTest.h b/Framework/DataObjects/test/EventListTest.h
index 322dd62446a7b0f08501cae0942ea7d267225470..236e8789225675832ad8ed68af90ec06bea3a692 100644
--- a/Framework/DataObjects/test/EventListTest.h
+++ b/Framework/DataObjects/test/EventListTest.h
@@ -16,6 +16,8 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::HistogramData;
using namespace Mantid::DataObjects;
+using Mantid::Types::DateAndTime;
+
using std::runtime_error;
using std::size_t;
@@ -2376,7 +2378,7 @@ public:
for (int time = 0; time < 1000; time++) {
// All pulse times from 0 to 999 in seconds
el += TofEvent(rand() % 1000,
- time); // Kernel::DateAndTime(time*1.0, 0.0) );
+ time); // Mantid::Types::DateAndTime(time*1.0, 0.0) );
}
}
@@ -2393,7 +2395,7 @@ public:
// All pulse times from 0 to 999 in seconds
DateAndTime pulsetime(static_cast<int64_t>(time * 1000000));
el += TofEvent(rand() % 1000,
- pulsetime); // Kernel::DateAndTime(time*1.0, 0.0) );
+ pulsetime); // Mantid::Types::DateAndTime(time*1.0, 0.0) );
}
}
diff --git a/Framework/DataObjects/test/EventWorkspaceTest.h b/Framework/DataObjects/test/EventWorkspaceTest.h
index c62c49456f30ff1f03980c1d49465a15ffeb0ba6..3e8ea385b2370c12abf76e0e8ee84a21f580d80a 100644
--- a/Framework/DataObjects/test/EventWorkspaceTest.h
+++ b/Framework/DataObjects/test/EventWorkspaceTest.h
@@ -8,22 +8,23 @@
#ifndef EVENTWORKSPACETEST_H_
#define EVENTWORKSPACETEST_H_
-#include <cxxtest/TestSuite.h>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/scoped_ptr.hpp>
+#include <cxxtest/TestSuite.h>
#include <string>
-#include "MantidHistogramData/LinearGenerator.h"
#include "MantidAPI/Axis.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidDataObjects/EventList.h"
#include "MantidDataObjects/EventWorkspace.h"
-#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidTestHelpers/ComponentCreationHelper.h"
+#include "MantidHistogramData/LinearGenerator.h"
#include "MantidKernel/Memory.h"
#include "MantidKernel/Timer.h"
+#include "MantidTestHelpers/ComponentCreationHelper.h"
+#include "MantidTestHelpers/WorkspaceCreationHelper.h"
+#include "MantidTypes/DateAndTime.h"
#include "PropertyManagerHelper.h"
using namespace Mantid;
@@ -32,15 +33,16 @@ using namespace Mantid::Kernel;
using namespace Mantid::Kernel::Exception;
using namespace Mantid::API;
+using std::cout;
using std::runtime_error;
using std::size_t;
using std::vector;
-using std::cout;
using namespace boost::posix_time;
using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::Histogram;
using Mantid::HistogramData::HistogramX;
using Mantid::HistogramData::LinearGenerator;
+using Mantid::Types::DateAndTime;
class EventWorkspaceTest : public CxxTest::TestSuite {
private:
@@ -618,7 +620,7 @@ public:
* Test that parallelization is thread-safe
*
*/
- void xtestSegFault() ///<Disabled because ~2.5 seconds.
+ void xtestSegFault() ///< Disabled because ~2.5 seconds.
{
int numpix = 100000;
EventWorkspace_const_sptr ew1 =
@@ -680,8 +682,8 @@ public:
}
/**
- * Test declaring an input EventWorkspace and retrieving as const_sptr or sptr
- */
+ * Test declaring an input EventWorkspace and retrieving as const_sptr or sptr
+ */
void testGetProperty_const_sptr() {
const std::string wsName = "InputWorkspace";
EventWorkspace_sptr wsInput(new EventWorkspace());
@@ -711,8 +713,9 @@ public:
}
/**
- * Test declaring an input IEventWorkspace and retrieving as const_sptr or sptr
- */
+ * Test declaring an input IEventWorkspace and retrieving as const_sptr or
+ * sptr
+ */
void testGetProperty_IEventWS_const_sptr() {
const std::string wsName = "InputWorkspace";
IEventWorkspace_sptr wsInput(new EventWorkspace());
diff --git a/Framework/DataObjects/test/EventsTest.h b/Framework/DataObjects/test/EventsTest.h
index c1a86efc4190770feef4459d9e9e13cd993af709..efd22f1818f9316452d7293bc605254882b122ae 100644
--- a/Framework/DataObjects/test/EventsTest.h
+++ b/Framework/DataObjects/test/EventsTest.h
@@ -1,8 +1,9 @@
#ifndef EVENTSTEST_H_
#define EVENTSTEST_H_ 1
-#include <cxxtest/TestSuite.h>
#include "MantidDataObjects/Events.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include <cxxtest/TestSuite.h>
using namespace Mantid;
using namespace Mantid::API;
@@ -20,9 +21,12 @@ public:
void test_Compare() {
// tof event
- TofEvent tofEvent1(20.0, Kernel::DateAndTime("1990-01-02 00:00:02.000"));
+ TofEvent tofEvent1(20.0,
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "1990-01-02 00:00:02.000"));
TofEvent tofEvent2(20.05,
- Kernel::DateAndTime("1990-01-02 00:00:02.000000001"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "1990-01-02 00:00:02.000000001"));
TS_ASSERT(tofEvent1 == tofEvent1);
TS_ASSERT(!(tofEvent1 == tofEvent2));
@@ -30,9 +34,15 @@ public:
// weighted
WeightedEvent wghtEvent1(
- 20.0, Kernel::DateAndTime("1990-01-02 00:00:02.000"), 1., 1.);
+ 20.0,
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "1990-01-02 00:00:02.000"),
+ 1., 1.);
WeightedEvent wghtEvent2(
- 20.05, Kernel::DateAndTime("1990-01-02 00:00:02.000000001"), 1.05, 1.);
+ 20.05,
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "1990-01-02 00:00:02.000000001"),
+ 1.05, 1.);
TS_ASSERT(wghtEvent1 == wghtEvent1);
TS_ASSERT(!(wghtEvent1 == wghtEvent2));
diff --git a/Framework/DataObjects/test/ScanningWorkspaceBuilderTest.h b/Framework/DataObjects/test/ScanningWorkspaceBuilderTest.h
index 5af78027ff3c92061f44432fd9941329c734a017..a17a8ee920a7b8cb4c5aa978eb6c8f00199a2cb9 100644
--- a/Framework/DataObjects/test/ScanningWorkspaceBuilderTest.h
+++ b/Framework/DataObjects/test/ScanningWorkspaceBuilderTest.h
@@ -21,6 +21,7 @@ using namespace Mantid::Geometry;
using namespace Mantid::HistogramData;
using namespace Mantid::Kernel;
using Mantid::DataObjects::ScanningWorkspaceBuilder;
+using Mantid::Types::DateAndTime;
namespace {
Instrument_const_sptr createSimpleInstrument(size_t nDetectors, size_t nBins) {
diff --git a/Framework/DataObjects/test/SplittersWorkspaceTest.h b/Framework/DataObjects/test/SplittersWorkspaceTest.h
index 8aea54f47aabc9e71ebe3f960e8f6a6d802f18c7..27836848c00d7e44dac8f498b99abe93ddb7f9eb 100644
--- a/Framework/DataObjects/test/SplittersWorkspaceTest.h
+++ b/Framework/DataObjects/test/SplittersWorkspaceTest.h
@@ -24,12 +24,12 @@ public:
void testClone() {
SplittersWorkspace splitterws;
- Kernel::SplittingInterval s1(Kernel::DateAndTime(10000),
- Kernel::DateAndTime(15000), 1);
- Kernel::SplittingInterval s2(Kernel::DateAndTime(20000),
- Kernel::DateAndTime(30000), 3);
- Kernel::SplittingInterval s3(Kernel::DateAndTime(40000),
- Kernel::DateAndTime(50000), 2);
+ Kernel::SplittingInterval s1(Mantid::Types::DateAndTime(10000),
+ Mantid::Types::DateAndTime(15000), 1);
+ Kernel::SplittingInterval s2(Mantid::Types::DateAndTime(20000),
+ Mantid::Types::DateAndTime(30000), 3);
+ Kernel::SplittingInterval s3(Mantid::Types::DateAndTime(40000),
+ Mantid::Types::DateAndTime(50000), 2);
splitterws.addSplitter(s1);
splitterws.addSplitter(s2);
@@ -46,12 +46,12 @@ public:
void test_Add() {
DataObjects::SplittersWorkspace splitterws;
- Kernel::SplittingInterval s1(Kernel::DateAndTime(10000),
- Kernel::DateAndTime(15000), 1);
- Kernel::SplittingInterval s2(Kernel::DateAndTime(20000),
- Kernel::DateAndTime(30000), 3);
- Kernel::SplittingInterval s3(Kernel::DateAndTime(40000),
- Kernel::DateAndTime(50000), 2);
+ Kernel::SplittingInterval s1(Mantid::Types::DateAndTime(10000),
+ Mantid::Types::DateAndTime(15000), 1);
+ Kernel::SplittingInterval s2(Mantid::Types::DateAndTime(20000),
+ Mantid::Types::DateAndTime(30000), 3);
+ Kernel::SplittingInterval s3(Mantid::Types::DateAndTime(40000),
+ Mantid::Types::DateAndTime(50000), 2);
TS_ASSERT_THROWS_NOTHING(splitterws.addSplitter(s1));
TS_ASSERT_THROWS_NOTHING(splitterws.addSplitter(s2));
@@ -63,12 +63,12 @@ public:
void test_AddGet() {
DataObjects::SplittersWorkspace splitterws;
- Kernel::SplittingInterval s1(Kernel::DateAndTime(10000),
- Kernel::DateAndTime(15000), 1);
- Kernel::SplittingInterval s2(Kernel::DateAndTime(20000),
- Kernel::DateAndTime(30000), 3);
- Kernel::SplittingInterval s3(Kernel::DateAndTime(40000),
- Kernel::DateAndTime(50000), 2);
+ Kernel::SplittingInterval s1(Mantid::Types::DateAndTime(10000),
+ Mantid::Types::DateAndTime(15000), 1);
+ Kernel::SplittingInterval s2(Mantid::Types::DateAndTime(20000),
+ Mantid::Types::DateAndTime(30000), 3);
+ Kernel::SplittingInterval s3(Mantid::Types::DateAndTime(40000),
+ Mantid::Types::DateAndTime(50000), 2);
std::vector<Kernel::SplittingInterval> splitters;
splitters.push_back(s1);
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Framework/Geometry/inc/MantidGeometry/Instrument.h
index beef98fa59f03188c2bdb2933c95207886b0f250..d7cc324d1e4a1127690bac005acef6807e3e6bab 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -7,7 +7,7 @@
#include "MantidGeometry/Instrument/CompAssembly.h"
#include "MantidGeometry/Instrument/ObjComponent.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <string>
#include <map>
@@ -196,18 +196,18 @@ public:
boost::shared_ptr<ParameterMap> getParameterMap() const;
/// @return the date from which the instrument definition begins to be valid.
- Kernel::DateAndTime getValidFromDate() const { return m_ValidFrom; }
+ Mantid::Types::DateAndTime getValidFromDate() const { return m_ValidFrom; }
/// @return the date at which the instrument definition is no longer valid.
- Kernel::DateAndTime getValidToDate() const { return m_ValidTo; }
+ Mantid::Types::DateAndTime getValidToDate() const { return m_ValidTo; }
/// Set the date from which the instrument definition begins to be valid.
/// @param val :: date
- void setValidFromDate(const Kernel::DateAndTime &val);
+ void setValidFromDate(const Mantid::Types::DateAndTime &val);
/// Set the date at which the instrument definition is no longer valid.
/// @param val :: date
- void setValidToDate(const Kernel::DateAndTime &val) { m_ValidTo = val; }
+ void setValidToDate(const Mantid::Types::DateAndTime &val) { m_ValidTo = val; }
// Methods for use with indirect geometry instruments,
// where the physical instrument differs from the 'neutronic' one
@@ -313,9 +313,9 @@ private:
boost::shared_ptr<ParameterMap> m_map_nonconst;
/// the date from which the instrument definition begins to be valid.
- Kernel::DateAndTime m_ValidFrom;
+ Mantid::Types::DateAndTime m_ValidFrom;
/// the date at which the instrument definition is no longer valid.
- Kernel::DateAndTime m_ValidTo;
+ Mantid::Types::DateAndTime m_ValidTo;
/// Path to the original IDF .xml file that was loaded for this instrument
mutable std::string m_filename;
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
index 9cfb043aa32bfa15d6b3e6515bb58c7f15e1263f..311bfd7cc8915815924d9c60a5f4e747eef888d7 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfo.h
@@ -2,7 +2,7 @@
#define MANTID_GEOMETRY_DETECTORINFO_H_
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Quat.h"
#include "MantidKernel/V3D.h"
@@ -119,13 +119,13 @@ public:
size_t indexOf(const detid_t id) const { return m_detIDToIndex->at(id); }
size_t scanCount(const size_t index) const;
- std::pair<Kernel::DateAndTime, Kernel::DateAndTime>
+ std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>
scanInterval(const std::pair<size_t, size_t> &index) const;
void setScanInterval(
const size_t index,
- const std::pair<Kernel::DateAndTime, Kernel::DateAndTime> &interval);
+ const std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime> &interval);
void setScanInterval(
- const std::pair<Kernel::DateAndTime, Kernel::DateAndTime> &interval);
+ const std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime> &interval);
void merge(const DetectorInfo &other);
diff --git a/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h b/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h
index 5103f70d30195f7a1c584894eb26bbc6ae374bbc..f81fff60eb63383b781b582ca5656ba916fa7589 100644
--- a/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h
+++ b/Framework/Geometry/inc/MantidGeometry/PrecompiledHeader.h
@@ -9,7 +9,7 @@
#include "MantidKernel/Matrix.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Interpolation.h"
// STL
diff --git a/Framework/Geometry/src/Instrument.cpp b/Framework/Geometry/src/Instrument.cpp
index 0209401ec24175230ba72b4df47781dc8c08a818..a0f66d6ee7796a12bc84af64cedfda6560a966e6 100644
--- a/Framework/Geometry/src/Instrument.cpp
+++ b/Framework/Geometry/src/Instrument.cpp
@@ -1,27 +1,29 @@
#include "MantidGeometry/Instrument.h"
-#include "MantidGeometry/Instrument/ParComponentFactory.h"
-#include "MantidGeometry/Instrument/DetectorGroup.h"
-#include "MantidGeometry/Instrument/ReferenceFrame.h"
-#include "MantidGeometry/Instrument/RectangularDetector.h"
-#include "MantidGeometry/Instrument/RectangularDetectorPixel.h"
+#include "MantidBeamline/ComponentInfo.h"
+#include "MantidBeamline/DetectorInfo.h"
#include "MantidGeometry/Instrument/ComponentInfo.h"
+#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidGeometry/Instrument/InstrumentVisitor.h"
+#include "MantidGeometry/Instrument/ParComponentFactory.h"
+#include "MantidGeometry/Instrument/RectangularDetector.h"
+#include "MantidGeometry/Instrument/RectangularDetectorPixel.h"
+#include "MantidGeometry/Instrument/ReferenceFrame.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/EigenConversionHelpers.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/PhysicalConstants.h"
#include "MantidKernel/make_unique.h"
-#include "MantidBeamline/ComponentInfo.h"
-#include "MantidBeamline/DetectorInfo.h"
-#include <nexus/NeXusFile.hpp>
#include <boost/make_shared.hpp>
+#include <nexus/NeXusFile.hpp>
#include <queue>
+using namespace Mantid::Types;
using namespace Mantid::Kernel;
-using Mantid::Kernel::Exception::NotFoundError;
using Mantid::Kernel::Exception::InstrumentDefinitionError;
+using Mantid::Kernel::Exception::NotFoundError;
namespace Mantid {
namespace Geometry {
@@ -197,8 +199,8 @@ void Instrument::setPhysicalInstrument(std::unique_ptr<Instrument> physInst) {
//------------------------------------------------------------------------------------------
/** Fills a copy of the detector cache
-* @returns a map of the detectors hold by the instrument
-*/
+ * @returns a map of the detectors hold by the instrument
+ */
void Instrument::getDetectors(detid2det_map &out_map) const {
if (m_map) {
// Get the base instrument detectors
@@ -408,9 +410,9 @@ IComponent_const_sptr Instrument::getSample() const {
}
/** Gets the beam direction (i.e. source->sample direction).
-* Not virtual because it relies the getSample() & getPos() virtual functions
-* @returns A unit vector denoting the direction of the beam
-*/
+ * Not virtual because it relies the getSample() & getPos() virtual functions
+ * @returns A unit vector denoting the direction of the beam
+ */
Kernel::V3D Instrument::getBeamDirection() const {
V3D retval = getSample()->getPos() - getSource()->getPos();
retval.normalize();
@@ -419,9 +421,9 @@ Kernel::V3D Instrument::getBeamDirection() const {
//------------------------------------------------------------------------------------------
/** Get a shared pointer to a component by its ID, const version
-* @param id :: ID
-* @return A pointer to the component.
-*/
+ * @param id :: ID
+ * @return A pointer to the component.
+ */
boost::shared_ptr<const IComponent>
Instrument::getComponentByID(const IComponent *id) const {
const IComponent *base = static_cast<const IComponent *>(id);
@@ -497,18 +499,18 @@ auto find(T &map, const detid_t key) -> decltype(map.begin()) {
return it;
return map.end();
}
-}
+} // namespace
/** Gets a pointer to the detector from its ID
-* Note that for getting the detector associated with a spectrum, the
-* MatrixWorkspace::getDetector
-* method should be used rather than this one because it takes account of the
-* possibility of more
-* than one detector contributing to a single spectrum
-* @param detector_id The requested detector ID
-* @returns A pointer to the detector object
-* @throw NotFoundError If no detector is found for the detector ID given
-*/
+ * Note that for getting the detector associated with a spectrum, the
+ * MatrixWorkspace::getDetector
+ * method should be used rather than this one because it takes account of the
+ * possibility of more
+ * than one detector contributing to a single spectrum
+ * @param detector_id The requested detector ID
+ * @returns A pointer to the detector object
+ * @throw NotFoundError If no detector is found for the detector ID given
+ */
IDetector_const_sptr Instrument::getDetector(const detid_t &detector_id) const {
const auto &baseInstr = m_map ? *m_instr : *this;
const auto it = find(baseInstr.m_detectorCache, detector_id);
@@ -528,10 +530,10 @@ IDetector_const_sptr Instrument::getDetector(const detid_t &detector_id) const {
}
/** Gets a pointer to the base (non-parametrized) detector from its ID
- * returns null if the detector has not been found
- * @param detector_id The requested detector ID
- * @returns A const pointer to the detector object
- */
+ * returns null if the detector has not been found
+ * @param detector_id The requested detector ID
+ * @returns A const pointer to the detector object
+ */
const IDetector *Instrument::getBaseDetector(const detid_t &detector_id) const {
auto it = find(m_instr->m_detectorCache, detector_id);
if (it == m_instr->m_detectorCache.end()) {
@@ -694,13 +696,13 @@ void Instrument::markAsSource(const IComponent *comp) {
}
/** Mark a Component which has already been added to the Instrument (as a child
-*component)
-* to be a Detector by adding it to a detector cache.
-*
-* @param det :: Component to be marked (stored for later retrieval) as a
-*detector Component
-*
-*/
+ *component)
+ * to be a Detector by adding it to a detector cache.
+ *
+ * @param det :: Component to be marked (stored for later retrieval) as a
+ *detector Component
+ *
+ */
void Instrument::markAsDetector(const IDetector *det) {
if (m_map)
throw std::runtime_error("Instrument::markAsDetector() called on a "
@@ -737,10 +739,12 @@ void Instrument::markAsDetectorFinalize() {
// detectors, even if the actual detector is different. We mimic this behavior
// in this final sort by using stable_sort and removing duplicates. This will
// effectively favor the first detector with a certain ID that was added.
- std::stable_sort(m_detectorCache.begin(), m_detectorCache.end(),
- [](const std::tuple<detid_t, IDetector_const_sptr, bool> &a,
- const std::tuple<detid_t, IDetector_const_sptr, bool> &b)
- -> bool { return std::get<0>(a) < std::get<0>(b); });
+ std::stable_sort(
+ m_detectorCache.begin(), m_detectorCache.end(),
+ [](const std::tuple<detid_t, IDetector_const_sptr, bool> &a,
+ const std::tuple<detid_t, IDetector_const_sptr, bool> &b) -> bool {
+ return std::get<0>(a) < std::get<0>(b);
+ });
m_detectorCache.erase(
std::unique(m_detectorCache.begin(), m_detectorCache.end(),
[](const std::tuple<detid_t, IDetector_const_sptr, bool> &a,
@@ -750,13 +754,13 @@ void Instrument::markAsDetectorFinalize() {
}
/** Mark a Component which has already been added to the Instrument class
-* as a monitor and add it to the detector cache.
-*
-* @param det :: Component to be marked (stored for later retrieval) as a
-*detector Component
-*
-* @throw Exception::ExistsError if cannot add detector to cache
-*/
+ * as a monitor and add it to the detector cache.
+ *
+ * @param det :: Component to be marked (stored for later retrieval) as a
+ *detector Component
+ *
+ * @throw Exception::ExistsError if cannot add detector to cache
+ */
void Instrument::markAsMonitor(const IDetector *det) {
if (m_map)
throw std::runtime_error("Instrument::markAsMonitor() called on a "
@@ -1045,12 +1049,12 @@ void Instrument::saveNexus(::NeXus::File *file,
}
/* A private helper function so save information about a set of detectors to
-* Nexus
-* @param file :: open Nexus file ready to recieve the info about the set of
-* detectors
-* a group must be open that has only one call of this function.
-* @param detIDs :: the dectector IDs of the detectors belonging to the set
-*/
+ * Nexus
+ * @param file :: open Nexus file ready to recieve the info about the set of
+ * detectors
+ * a group must be open that has only one call of this function.
+ * @param detIDs :: the dectector IDs of the detectors belonging to the set
+ */
void Instrument::saveDetectorSetInfoToNexus(
::NeXus::File *file, const std::vector<detid_t> &detIDs) const {
@@ -1095,9 +1099,9 @@ void Instrument::saveDetectorSetInfoToNexus(
//--------------------------------------------------------------------------------------------
/** Load the object from an open NeXus file.
-* @param file :: open NeXus file
-* @param group :: name of the group to open
-*/
+ * @param file :: open NeXus file
+ * @param group :: name of the group to open
+ */
void Instrument::loadNexus(::NeXus::File *file, const std::string &group) {
file->openGroup(group, "NXinstrument");
file->closeGroup();
@@ -1152,8 +1156,9 @@ void Instrument::setDefaultView(const std::string &type) {
/// @param val :: date and time
/// @throw InstrumentDefinitionError Thrown if date is earlier than 1900-01-31
/// 23:59:01
-void Instrument::setValidFromDate(const Kernel::DateAndTime &val) {
- Kernel::DateAndTime earliestAllowedDate("1900-01-31 23:59:01");
+void Instrument::setValidFromDate(const Mantid::Types::DateAndTime &val) {
+ DateAndTime earliestAllowedDate =
+ DateAndTimeHelpers::createFromISO8601("1900-01-31 23:59:01");
if (val < earliestAllowedDate) {
throw Kernel::Exception::InstrumentDefinitionError(
"The valid-from <instrument> tag date must be from 1900-01-31 23:59:01 "
@@ -1462,6 +1467,6 @@ double tofToDSpacingFactor(const double l1, const double l2,
}
return factor / static_cast<double>(detectors.size());
}
-}
+} // namespace Conversion
} // namespace Geometry
} // Namespace Mantid
diff --git a/Framework/Geometry/src/Instrument/DetectorInfo.cpp b/Framework/Geometry/src/Instrument/DetectorInfo.cpp
index 121d7e24b6631478cf13167d56c98da5c2fa63dd..17fa7defb4017816b07a4676a7e8c5c22b471c6f 100644
--- a/Framework/Geometry/src/Instrument/DetectorInfo.cpp
+++ b/Framework/Geometry/src/Instrument/DetectorInfo.cpp
@@ -324,8 +324,8 @@ size_t DetectorInfo::scanCount(const size_t index) const {
/** Returns the scan interval of the detector with given index.
*
* The interval start and end values would typically correspond to nanoseconds
- * since 1990, as in Kernel::DateAndTime. */
-std::pair<Kernel::DateAndTime, Kernel::DateAndTime>
+ * since 1990, as in Mantid::Types::DateAndTime. */
+std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime>
DetectorInfo::scanInterval(const std::pair<size_t, size_t> &index) const {
const auto &interval = m_detectorInfo->scanInterval(index);
return {interval.first, interval.second};
@@ -334,13 +334,13 @@ DetectorInfo::scanInterval(const std::pair<size_t, size_t> &index) const {
/** Set the scan interval of the detector with given detector index.
*
* The interval start and end values would typically correspond to nanoseconds
- * since 1990, as in Kernel::DateAndTime. Note that it is currently not possible
+ * since 1990, as in Mantid::Types::DateAndTime. Note that it is currently not possible
* to modify scan intervals for a DetectorInfo with time-dependent detectors,
* i.e., time intervals must be set with this method before merging individual
* scans. */
void DetectorInfo::setScanInterval(
const size_t index,
- const std::pair<Kernel::DateAndTime, Kernel::DateAndTime> &interval) {
+ const std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime> &interval) {
m_detectorInfo->setScanInterval(index, {interval.first.totalNanoseconds(),
interval.second.totalNanoseconds()});
}
@@ -350,7 +350,7 @@ void DetectorInfo::setScanInterval(
* Prefer this over setting intervals for individual detectors since it enables
* internal performance optimization. See also overload for other details. */
void DetectorInfo::setScanInterval(
- const std::pair<Kernel::DateAndTime, Kernel::DateAndTime> &interval) {
+ const std::pair<Mantid::Types::DateAndTime, Mantid::Types::DateAndTime> &interval) {
m_detectorInfo->setScanInterval(
{interval.first.totalNanoseconds(), interval.second.totalNanoseconds()});
}
diff --git a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
index 62e0b6d875c8f4330375bd646fbd4ba9a06d0a87..b83a92e5477636be2d1f42404a4ab4ba9b4e83c0 100644
--- a/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
+++ b/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
@@ -18,6 +18,7 @@
#include "MantidKernel/Strings.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/make_unique.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/DOMWriter.h>
@@ -37,6 +38,7 @@
using namespace Mantid;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::Element;
@@ -928,7 +930,7 @@ void InstrumentDefinitionParser::setValidityRange(
"<instrument> element must contain a valid-from tag", filename);
} else {
try {
- DateAndTime d(pRootElem->getAttribute("valid-from"));
+ DateAndTime d = DateAndTimeHelpers::createFromISO8601(pRootElem->getAttribute("valid-from"));
m_instrument->setValidFromDate(d);
} catch (...) {
throw Kernel::Exception::InstrumentDefinitionError(
@@ -944,7 +946,7 @@ void InstrumentDefinitionParser::setValidityRange(
// must contain a valid-to tag", filename);
} else {
try {
- DateAndTime d(pRootElem->getAttribute("valid-to"));
+ DateAndTime d = DateAndTimeHelpers::createFromISO8601(pRootElem->getAttribute("valid-to"));
m_instrument->setValidToDate(d);
} catch (...) {
throw Kernel::Exception::InstrumentDefinitionError(
diff --git a/Framework/Geometry/src/Instrument/ParameterMap.cpp b/Framework/Geometry/src/Instrument/ParameterMap.cpp
index 9fd7379d0ce43b201158979412188e5afb2cbc10..8dc00a18a1587479c618fc309a02fd116c18b485 100644
--- a/Framework/Geometry/src/Instrument/ParameterMap.cpp
+++ b/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -1125,7 +1125,7 @@ void ParameterMap::saveNexus(::NeXus::File *file,
file->putAttr("version", 1);
file->writeData("author", "");
file->writeData("date",
- Kernel::DateAndTime::getCurrentTime().toISO8601String());
+ Mantid::Types::DateAndTime::getCurrentTime().toISO8601String());
file->writeData("description", "A string representation of the parameter "
"map. The format is either: "
"|detID:id-value;param-type;param-name;param-"
diff --git a/Framework/Geometry/test/CMakeLists.txt b/Framework/Geometry/test/CMakeLists.txt
index b5dd8e019a257ef4512ac036ce2693474ce8a353..3dd8f4c0ec40afcd0c2aef2c44db0c04e63ac454 100644
--- a/Framework/Geometry/test/CMakeLists.txt
+++ b/Framework/Geometry/test/CMakeLists.txt
@@ -16,6 +16,7 @@ if ( CXXTEST_FOUND )
target_link_libraries( GeometryTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
Geometry
Beamline
+ Types
Kernel
${NEXUS_LIBRARIES}
${GSL_LIBRARIES}
diff --git a/Framework/Geometry/test/InstrumentTest.h b/Framework/Geometry/test/InstrumentTest.h
index a16afd3bf881982a3d9af7ab68b7ceb282444f3d..ef3342cf5e8171155027e5cdfb873ce24df24f57 100644
--- a/Framework/Geometry/test/InstrumentTest.h
+++ b/Framework/Geometry/test/InstrumentTest.h
@@ -2,17 +2,17 @@
#define INSTRUMENTTEST_H_
#include "MantidGeometry/Instrument.h"
-#include "MantidKernel/EigenConversionHelpers.h"
-#include "MantidKernel/Exception.h"
-#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidGeometry/Instrument/ComponentInfo.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorInfo.h"
-#include "MantidGeometry/Instrument/RectangularDetector.h"
-#include <cxxtest/TestSuite.h>
-#include "MantidKernel/DateAndTime.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
+#include "MantidGeometry/Instrument/RectangularDetector.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/EigenConversionHelpers.h"
+#include "MantidKernel/Exception.h"
+#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <boost/make_shared.hpp>
+#include <cxxtest/TestSuite.h>
using namespace Mantid;
using namespace Mantid::Kernel;
@@ -419,8 +419,12 @@ public:
void test_getValidFromDate() {
Instrument_sptr inst =
ComponentCreationHelper::createTestInstrumentRectangular(5, 6);
- Kernel::DateAndTime validFrom("1900-01-31T23:59:59");
- Kernel::DateAndTime validTo("2100-01-31 23:59:59");
+ Mantid::Types::DateAndTime validFrom =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "1900-01-31T23:59:59");
+ Mantid::Types::DateAndTime validTo =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2100-01-31 23:59:59");
inst->setValidFromDate(validFrom);
inst->setValidToDate(validTo);
TS_ASSERT_EQUALS(inst->getValidFromDate(), validFrom);
@@ -592,9 +596,10 @@ public:
TS_ASSERT(toQuaterniond(legacyInstrument.getDetector(19)->getRotation())
.isApprox(toQuaterniond(detRot * bankRot), 1e-10));
// Check the scale factor
- TS_ASSERT(toVector3d(legacyInstrument.getComponentByName("bank3")
- ->getScaleFactor())
- .isApprox(toVector3d(newScaleFactor), 1e-10));
+ TS_ASSERT(
+ toVector3d(
+ legacyInstrument.getComponentByName("bank3")->getScaleFactor())
+ .isApprox(toVector3d(newScaleFactor), 1e-10));
}
void test_makeLegacyParameterMap_scaled_RectangularDetector() {
diff --git a/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h b/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
index 2ac16c89d9061ff5d61f0f1e8e0ffa22f567e308..970ba84d5e70f3cf096d36f0513bef169a9a5961 100644
--- a/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
+++ b/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
@@ -5,6 +5,7 @@
#include "MantidAPI/ICatalogInfoService.h"
#include "MantidAPI/TableRow.h"
#include "MantidICat/CatalogSearchParam.h"
+#include "MantidICat/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.h"
namespace Mantid {
namespace ICat {
diff --git a/Framework/ICat/src/CatalogKeepAlive.cpp b/Framework/ICat/src/CatalogKeepAlive.cpp
index fb55f97be3ede909c37f4a1f18c5bb95b6599d1d..49eef32ca6c6eb6441644a6e9492746973c30455 100644
--- a/Framework/ICat/src/CatalogKeepAlive.cpp
+++ b/Framework/ICat/src/CatalogKeepAlive.cpp
@@ -1,6 +1,6 @@
#include "MantidICat/CatalogKeepAlive.h"
#include "MantidAPI/CatalogManager.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <Poco/Thread.h>
@@ -22,7 +22,7 @@ void CatalogKeepAlive::exec() {
if (timePeriod <= 0)
throw std::runtime_error("TimePeriod must be greater than zero.");
- Kernel::DateAndTime lastTimeExecuted = Kernel::DateAndTime::getCurrentTime();
+ Mantid::Types::DateAndTime lastTimeExecuted = Mantid::Types::DateAndTime::getCurrentTime();
// Keep going until cancelled
while (true) {
@@ -31,14 +31,14 @@ void CatalogKeepAlive::exec() {
// Exit if the user presses cancel
this->interruption_point();
- double secondsSinceExecuted = Kernel::DateAndTime::secondsFromDuration(
- Kernel::DateAndTime::getCurrentTime() - lastTimeExecuted);
+ double secondsSinceExecuted = Mantid::Types::DateAndTime::secondsFromDuration(
+ Mantid::Types::DateAndTime::getCurrentTime() - lastTimeExecuted);
if (secondsSinceExecuted > timePeriod) {
API::CatalogManager::Instance()
.getCatalog(getPropertyValue("Session"))
->keepAlive();
- lastTimeExecuted = Kernel::DateAndTime::getCurrentTime();
+ lastTimeExecuted = Mantid::Types::DateAndTime::getCurrentTime();
}
}
}
diff --git a/Framework/ICat/src/CatalogSearchParam.cpp b/Framework/ICat/src/CatalogSearchParam.cpp
index ec808815a0e4bd7a9d0b993d513c4e4d17dbe73c..54db9200343290719e6fe78154625c426d5ed901 100644
--- a/Framework/ICat/src/CatalogSearchParam.cpp
+++ b/Framework/ICat/src/CatalogSearchParam.cpp
@@ -1,5 +1,5 @@
#include "MantidICat/CatalogSearchParam.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <boost/algorithm/string/regex.hpp>
namespace Mantid {
@@ -222,7 +222,8 @@ time_t CatalogSearchParam::getTimevalue(const std::string &inputDate) {
std::string isoDate = dateSegments.at(2) + "-" + dateSegments.at(1) + "-" +
dateSegments.at(0) + " 0:00:00.000";
// Return the date as time_t value.
- return Kernel::DateAndTime(isoDate).to_time_t();
-}
-}
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(isoDate)
+ .to_time_t();
}
+} // namespace ICat
+} // namespace Mantid
diff --git a/Framework/ICat/src/ICat4/ICat4Catalog.cpp b/Framework/ICat/src/ICat4/ICat4Catalog.cpp
index c8e550a0217abe5e2fb58c9e968f0e242c384770..2248d2c5f6ede012cbd032e4f96c37213212631a 100644
--- a/Framework/ICat/src/ICat4/ICat4Catalog.cpp
+++ b/Framework/ICat/src/ICat4/ICat4Catalog.cpp
@@ -1,14 +1,13 @@
-#include "MantidAPI/ITableWorkspace.h"
+#include "MantidICat/ICat4/ICat4Catalog.h"
#include "MantidAPI/CatalogFactory.h"
+#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/Progress.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidICat/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.h"
-#include "MantidICat/ICat4/ICat4Catalog.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/FacilityInfo.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
+#include "MantidTypes/DateAndTime.h"
namespace Mantid {
namespace ICat {
@@ -18,7 +17,7 @@ using namespace ICat4;
namespace {
/// static logger
Logger g_log("ICat4Catalog");
-}
+} // namespace
DECLARE_CATALOG(ICat4Catalog)
@@ -780,7 +779,7 @@ std::string ICat4Catalog::bytesToString(int64_t &fileSize) {
*/
std::string ICat4Catalog::formatDateTime(const time_t ×tamp,
const std::string &format) {
- auto dateTime = DateAndTime(boost::posix_time::from_time_t(timestamp));
+ auto dateTime = Types::DateAndTime(boost::posix_time::from_time_t(timestamp));
return (dateTime.toFormattedString(format));
}
@@ -948,5 +947,5 @@ bool ICat4Catalog::isAccessAllowed(ns1__accessType accessType, T &bean) {
throwErrorMessage(icat);
return false;
}
-}
-}
+} // namespace ICat
+} // namespace Mantid
diff --git a/Framework/Kernel/CMakeLists.txt b/Framework/Kernel/CMakeLists.txt
index 4f9095c7ea693285931a16bcdc5d4c499131bf4f..518825309a2550dad471993fc5a31b804f62044e 100644
--- a/Framework/Kernel/CMakeLists.txt
+++ b/Framework/Kernel/CMakeLists.txt
@@ -13,8 +13,8 @@ set ( SRC_FILES
src/CompositeValidator.cpp
src/ComputeResourceInfo.cpp
src/ConfigService.cpp
- src/DataItem.cpp
- src/DateAndTime.cpp
+ src/DateAndTimeHelpers.cpp
+ src/DataItem.cpp
src/DateAndTimeHelpers.cpp
src/DateTimeValidator.cpp
src/DateValidator.cpp
@@ -109,6 +109,7 @@ set ( SRC_FILES
src/ThreadPool.cpp
src/ThreadPoolRunnable.cpp
src/ThreadSafeLogStream.cpp
+ src/TimeInterval.cpp
src/TimeSeriesProperty.cpp
src/TimeSplitter.cpp
src/Timer.cpp
@@ -162,9 +163,9 @@ set ( INC_FILES
inc/MantidKernel/CompositeValidator.h
inc/MantidKernel/ComputeResourceInfo.h
inc/MantidKernel/ConfigService.h
+ inc/MantidKernel/DateAndTimeHelpers.h
inc/MantidKernel/DataItem.h
inc/MantidKernel/DataService.h
- inc/MantidKernel/DateAndTime.h
inc/MantidKernel/DateAndTimeHelpers.h
inc/MantidKernel/DateTimeValidator.h
inc/MantidKernel/DateValidator.h
@@ -286,7 +287,8 @@ set ( INC_FILES
inc/MantidKernel/ThreadSafeLogStream.h
inc/MantidKernel/ThreadScheduler.h
inc/MantidKernel/ThreadSchedulerMutexes.h
- inc/MantidKernel/TimeSeriesProperty.h
+ inc/MantidKernel/TimeInterval.h
+ inc/MantidKernel/TimeSeriesProperty.h
inc/MantidKernel/TimeSplitter.h
inc/MantidKernel/Timer.h
inc/MantidKernel/Tolerance.h
@@ -336,8 +338,7 @@ set ( TEST_FILES
ConfigServiceTest.h
CowPtrTest.h
DataServiceTest.h
- DateAndTimeHelpersTest.h
- DateAndTimeTest.h
+ DateAndTimeHelpersTest.h
DateTimeValidatorTest.h
DateValidatorTest.h
DeltaEModeTest.h
@@ -430,6 +431,7 @@ set ( TEST_FILES
ThreadPoolTest.h
ThreadSchedulerMutexesTest.h
ThreadSchedulerTest.h
+ TimeIntervalTest.h
TimeSeriesPropertyTest.h
TimeSplitterTest.h
TimerTest.h
diff --git a/Framework/Kernel/inc/MantidKernel/IPropertyManager.h b/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
index 45179ba3cb3591482425871ca6c465a54dc8edd2..76b497fe93d17b8244eaf703c2f875aca618b61d 100644
--- a/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
+++ b/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
@@ -1,11 +1,11 @@
#ifndef MANTID_KERNEL_IPROPERTYMANAGER_H_
#define MANTID_KERNEL_IPROPERTYMANAGER_H_
-#include "MantidKernel/PropertyWithValue.h"
-#include "MantidKernel/make_unique.h"
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/IValidator.h"
#include "MantidKernel/NullValidator.h"
+#include "MantidKernel/PropertyWithValue.h"
+#include "MantidKernel/make_unique.h"
#ifndef Q_MOC_RUN
#include <boost/make_shared.hpp>
@@ -23,11 +23,12 @@ class Value;
}
namespace Mantid {
-
+namespace Types {
+class DateAndTime;
+}
namespace Kernel {
class DataItem;
-class DateAndTime;
class IPropertySettings;
class OptionalBool;
class Property;
@@ -89,8 +90,8 @@ public:
*/
virtual void setPropertiesWithString(
const std::string &propertiesString,
- const std::unordered_set<std::string> &
- ignoreProperties = std::unordered_set<std::string>()) = 0;
+ const std::unordered_set<std::string> &ignoreProperties =
+ std::unordered_set<std::string>()) = 0;
/** Sets all the declared properties from a string.
@param propertiesJson :: A string of name = value pairs formatted
@@ -100,8 +101,8 @@ public:
*/
virtual void
setProperties(const std::string &propertiesJson,
- const std::unordered_set<std::string> &
- ignoreProperties = std::unordered_set<std::string>()) = 0;
+ const std::unordered_set<std::string> &ignoreProperties =
+ std::unordered_set<std::string>()) = 0;
/** Sets all the declared properties from a json object
@param jsonValue :: A json name value pair collection
@@ -110,8 +111,8 @@ public:
*/
virtual void
setProperties(const ::Json::Value &jsonValue,
- const std::unordered_set<std::string> &
- ignoreProperties = std::unordered_set<std::string>()) = 0;
+ const std::unordered_set<std::string> &ignoreProperties =
+ std::unordered_set<std::string>()) = 0;
/** Sets property value from a string
@param name :: Property name
@@ -169,24 +170,24 @@ public:
}
/** Specialised version of setProperty template method to handle const char *
- * @param name :: The name of the property (case insensitive)
- * @param value :: The value to assign to the property
- * @throw Exception::NotFoundError If the named property is unknown
- * @throw std::invalid_argument If an attempt is made to assign to a property
- * of different type
- */
+ * @param name :: The name of the property (case insensitive)
+ * @param value :: The value to assign to the property
+ * @throw Exception::NotFoundError If the named property is unknown
+ * @throw std::invalid_argument If an attempt is made to assign to a property
+ * of different type
+ */
IPropertyManager *setProperty(const std::string &name, const char *value) {
this->setPropertyValue(name, std::string(value));
return this;
}
/** Specialised version of setProperty template method to handle std::string
- * @param name :: The name of the property (case insensitive)
- * @param value :: The value to assign to the property
- * @throw Exception::NotFoundError If the named property is unknown
- * @throw std::invalid_argument If an attempt is made to assign to a property
- * of different type
- */
+ * @param name :: The name of the property (case insensitive)
+ * @param value :: The value to assign to the property
+ * @throw Exception::NotFoundError If the named property is unknown
+ * @throw std::invalid_argument If an attempt is made to assign to a property
+ * of different type
+ */
IPropertyManager *setProperty(const std::string &name,
const std::string &value) {
this->setPropertyValue(name, value);
@@ -217,8 +218,8 @@ public:
/// Get the list of managed properties in a given group.
std::vector<Property *> getPropertiesInGroup(const std::string &group) const;
- virtual void filterByTime(const DateAndTime & /*start*/,
- const DateAndTime & /*stop*/) = 0;
+ virtual void filterByTime(const Types::DateAndTime & /*start*/,
+ const Types::DateAndTime & /*stop*/) = 0;
virtual void
splitByTime(std::vector<SplittingInterval> & /*splitter*/,
std::vector<PropertyManager *> /* outputs*/) const = 0;
@@ -226,16 +227,16 @@ public:
protected:
/** Add a property of the template type to the list of managed properties
- * @param name :: The name to assign to the property
- * @param value :: The initial value to assign to the property
- * @param validator :: Pointer to the (optional) validator.
- * @param doc :: The (optional) documentation string
- * @param direction :: The (optional) direction of the property, in, out or
- * inout
- * @throw Exception::ExistsError if a property with the given name already
- * exists
- * @throw std::invalid_argument if the name argument is empty
- */
+ * @param name :: The name to assign to the property
+ * @param value :: The initial value to assign to the property
+ * @param validator :: Pointer to the (optional) validator.
+ * @param doc :: The (optional) documentation string
+ * @param direction :: The (optional) direction of the property, in, out or
+ * inout
+ * @throw Exception::ExistsError if a property with the given name already
+ * exists
+ * @throw std::invalid_argument if the name argument is empty
+ */
template <typename T>
void declareProperty(
const std::string &name, T value,
@@ -249,15 +250,15 @@ protected:
}
/** Add a property to the list of managed properties with no validator
- * @param name :: The name to assign to the property
- * @param value :: The initial value to assign to the property
- * @param doc :: The documentation string
- * @param direction :: The (optional) direction of the property, in (default),
- * out or inout
- * @throw Exception::ExistsError if a property with the given name already
- * exists
- * @throw std::invalid_argument if the name argument is empty
- */
+ * @param name :: The name to assign to the property
+ * @param value :: The initial value to assign to the property
+ * @param doc :: The documentation string
+ * @param direction :: The (optional) direction of the property, in
+ * (default), out or inout
+ * @throw Exception::ExistsError if a property with the given name already
+ * exists
+ * @throw std::invalid_argument if the name argument is empty
+ */
template <typename T>
void declareProperty(const std::string &name, T value, const std::string &doc,
const unsigned int direction = Direction::Input) {
@@ -268,13 +269,13 @@ protected:
}
/** Add a property of the template type to the list of managed properties
- * @param name :: The name to assign to the property
- * @param value :: The initial value to assign to the property
- * @param direction :: The direction of the property, in, out or inout
- * @throw Exception::ExistsError if a property with the given name already
- * exists
- * @throw std::invalid_argument if the name argument is empty
- */
+ * @param name :: The name to assign to the property
+ * @param value :: The initial value to assign to the property
+ * @param direction :: The direction of the property, in, out or inout
+ * @throw Exception::ExistsError if a property with the given name already
+ * exists
+ * @throw std::invalid_argument if the name argument is empty
+ */
template <typename T>
void declareProperty(const std::string &name, T value,
const unsigned int direction) {
@@ -285,22 +286,22 @@ protected:
}
/** Specialised version of declareProperty template method to prevent the
- * creation of a
- * PropertyWithValue of type const char* if an argument in quotes is passed
- * (it will be
- * converted to a string). The validator, if provided, needs to be a string
- * validator.
- * @param name :: The name to assign to the property
- * @param value :: The initial value to assign to the property
- * @param validator :: Pointer to the (optional) validator. Ownership will be
- * taken over.
- * @param doc :: The (optional) documentation string
- * @param direction :: The (optional) direction of the property, in, out or
- * inout
- * @throw Exception::ExistsError if a property with the given name already
- * exists
- * @throw std::invalid_argument if the name argument is empty
- */
+ * creation of a
+ * PropertyWithValue of type const char* if an argument in quotes is passed
+ * (it will be
+ * converted to a string). The validator, if provided, needs to be a string
+ * validator.
+ * @param name :: The name to assign to the property
+ * @param value :: The initial value to assign to the property
+ * @param validator :: Pointer to the (optional) validator. Ownership will be
+ * taken over.
+ * @param doc :: The (optional) documentation string
+ * @param direction :: The (optional) direction of the property, in, out or
+ * inout
+ * @throw Exception::ExistsError if a property with the given name already
+ * exists
+ * @throw std::invalid_argument if the name argument is empty
+ */
void declareProperty(
const std::string &name, const char *value,
IValidator_sptr validator = boost::make_shared<NullValidator>(),
@@ -312,22 +313,22 @@ protected:
}
/** Specialised version of declareProperty template method to prevent the
- * creation of a
- * PropertyWithValue of type const char* if an argument in quotes is passed
- * (it will be
- * converted to a string). The validator, if provided, needs to be a string
- * validator.
- * @param name :: The name to assign to the property
- * @param value :: The initial value to assign to the property
- * @param doc :: The (optional) documentation string
- * @param validator :: Pointer to the (optional) validator. Ownership will be
- * taken over.
- * @param direction :: The (optional) direction of the property, in, out or
- * inout
- * @throw Exception::ExistsError if a property with the given name already
- * exists
- * @throw std::invalid_argument if the name argument is empty
- */
+ * creation of a
+ * PropertyWithValue of type const char* if an argument in quotes is passed
+ * (it will be
+ * converted to a string). The validator, if provided, needs to be a string
+ * validator.
+ * @param name :: The name to assign to the property
+ * @param value :: The initial value to assign to the property
+ * @param doc :: The (optional) documentation string
+ * @param validator :: Pointer to the (optional) validator. Ownership will be
+ * taken over.
+ * @param direction :: The (optional) direction of the property, in, out or
+ * inout
+ * @throw Exception::ExistsError if a property with the given name already
+ * exists
+ * @throw std::invalid_argument if the name argument is empty
+ */
void declareProperty(
const std::string &name, const char *value, const std::string &doc,
IValidator_sptr validator = boost::make_shared<NullValidator>(),
@@ -338,13 +339,13 @@ protected:
}
/** Add a property of string type to the list of managed properties
- * @param name :: The name to assign to the property
- * @param value :: The initial value to assign to the property
- * @param direction :: The direction of the property, in, out or inout
- * @throw Exception::ExistsError if a property with the given name already
- * exists
- * @throw std::invalid_argument if the name argument is empty
- */
+ * @param name :: The name to assign to the property
+ * @param value :: The initial value to assign to the property
+ * @param direction :: The direction of the property, in, out or inout
+ * @throw Exception::ExistsError if a property with the given name already
+ * exists
+ * @throw std::invalid_argument if the name argument is empty
+ */
void declareProperty(const std::string &name, const char *value,
const unsigned int direction) {
declareProperty(name, std::string(value),
diff --git a/Framework/Kernel/inc/MantidKernel/ITimeSeriesProperty.h b/Framework/Kernel/inc/MantidKernel/ITimeSeriesProperty.h
index 731e44eb9e8888fced5f39528e7308743be9d4c2..f594f879dcfa397878d1f34ab880a3428b1b18ea 100644
--- a/Framework/Kernel/inc/MantidKernel/ITimeSeriesProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/ITimeSeriesProperty.h
@@ -4,11 +4,13 @@
#include <vector>
namespace Mantid {
+namespace Types {
+class DateAndTime;
+}
namespace Kernel {
//---------------------------------------------------------------------------
// Forward Declarations
//---------------------------------------------------------------------------
-class DateAndTime;
class SplittingInterval;
class TimeInterval;
class Property;
@@ -50,7 +52,7 @@ public:
virtual double
averageValueInFilter(const std::vector<SplittingInterval> &filter) const = 0;
/// Return the time series's times as a vector<DateAndTime>
- virtual std::vector<DateAndTime> timesAsVector() const = 0;
+ virtual std::vector<Types::DateAndTime> timesAsVector() const = 0;
/// Returns the calculated time weighted average value
virtual double timeAverageValue() const = 0;
/// Returns the real size of the time series property map:
diff --git a/Framework/Kernel/inc/MantidKernel/LogParser.h b/Framework/Kernel/inc/MantidKernel/LogParser.h
index c6d3a449bd8e8b86bdcb6f7cb0fa1362e18f4bf2..9eb5b9e376a088ecf00fcc0a59b2e05f4ee86949 100644
--- a/Framework/Kernel/inc/MantidKernel/LogParser.h
+++ b/Framework/Kernel/inc/MantidKernel/LogParser.h
@@ -14,13 +14,15 @@
#include <sstream>
namespace Mantid {
-
+namespace Types {
+class DateAndTime;
+}
namespace Kernel {
//-------------------------------------------------------------------------
// Forward declarations
//-------------------------------------------------------------------------
-class DateAndTime;
+
class Property;
template <typename T> class TimeSeriesProperty;
@@ -64,7 +66,7 @@ public:
const std::string &name);
/// Check if the icp log commands are in the new style
static bool isICPEventLogNewStyle(
- const std::multimap<Kernel::DateAndTime, std::string> &logm);
+ const std::multimap<Mantid::Types::DateAndTime, std::string> &logm);
public:
/// Create given the icpevent log property
@@ -89,13 +91,13 @@ public:
private:
/// Parse the icp event log with old style commands
void parseOldStyleCommands(
- const std::multimap<Kernel::DateAndTime, std::string> &logm,
+ const std::multimap<Mantid::Types::DateAndTime, std::string> &logm,
Kernel::TimeSeriesProperty<int> *periods,
Kernel::TimeSeriesProperty<bool> *status);
/// Parse the icp event log with new style commands
void parseNewStyleCommands(
- const std::multimap<Kernel::DateAndTime, std::string> &logm,
+ const std::multimap<Mantid::Types::DateAndTime, std::string> &logm,
Kernel::TimeSeriesProperty<int> *periods,
Kernel::TimeSeriesProperty<bool> *status);
@@ -119,7 +121,7 @@ private:
CommandMap createCommandMap(bool newStyle) const;
/// Try to parse period data.
- void tryParsePeriod(const std::string &scom, const DateAndTime &time,
+ void tryParsePeriod(const std::string &scom, const Types::DateAndTime &time,
std::istringstream &idata,
Kernel::TimeSeriesProperty<int> *const periods);
};
diff --git a/Framework/Kernel/inc/MantidKernel/Property.h b/Framework/Kernel/inc/MantidKernel/Property.h
index 06b5cf12a4aaddea29c37cb2c68b7fe6bc2d9847..c4feb181c0b2efe986b411b18264a65da91a5a53 100644
--- a/Framework/Kernel/inc/MantidKernel/Property.h
+++ b/Framework/Kernel/inc/MantidKernel/Property.h
@@ -22,12 +22,15 @@ class typeinfo;
}
namespace Mantid {
+namespace Types {
+class DateAndTime;
+}
namespace Kernel {
//-----------------------------------------------------------------------------
// Forward declarations
//-----------------------------------------------------------------------------
class DataItem;
-class DateAndTime;
+
class IPropertySettings;
class PropertyHistory;
class SplittingInterval;
@@ -157,8 +160,8 @@ public:
virtual std::string getDefault() const = 0;
/** Is Multiple Selection Allowed
- * @return true if multiple selection is allowed
- */
+ * @return true if multiple selection is allowed
+ */
virtual bool isMultipleSelectionAllowed() { return false; };
virtual std::vector<std::string> allowedValues() const;
@@ -175,8 +178,8 @@ public:
/// Add to this
virtual Property &operator+=(Property const *rhs) = 0;
- virtual void filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop);
+ virtual void filterByTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop);
virtual void splitByTime(std::vector<SplittingInterval> &splitter,
std::vector<Property *> outputs,
bool isProtonCharge = true) const;
@@ -190,8 +193,8 @@ public:
virtual size_t getMemorySize() const { return sizeof(Property); }
/** Just returns the property (*this) unless overridden
- * @return a property with the value
- */
+ * @return a property with the value
+ */
virtual Property &merge(Property *) { return *this; }
/// Set the group this property belongs to
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManager.h b/Framework/Kernel/inc/MantidKernel/PropertyManager.h
index 52e163a09002552d40643aa48a55bb66acc3778c..6f189cc1e535161cf09c898c62c3139c5622e299 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManager.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManager.h
@@ -62,8 +62,8 @@ public:
PropertyManager &operator=(const PropertyManager &);
PropertyManager &operator+=(const PropertyManager &rhs);
- void filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop) override;
+ void filterByTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop) override;
void splitByTime(std::vector<SplittingInterval> &splitter,
std::vector<PropertyManager *> outputs) const override;
void filterByProperty(const TimeSeriesProperty<bool> &filter) override;
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
index a636ff2e6e4df5f695df630e0d18a3211ca78cfa..8a25a30c7a1bf6efc3dfe9d1c553451c4c446abe 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
@@ -111,8 +111,8 @@ public:
/// The argument is the property name. Default - do nothing.
void afterPropertySet(const std::string &) override;
- void filterByTime(const DateAndTime & /*start*/,
- const DateAndTime & /*stop*/) override {
+ void filterByTime(const Types::DateAndTime & /*start*/,
+ const Types::DateAndTime & /*stop*/) override {
throw(std::runtime_error("Not yet implmented"));
}
void splitByTime(std::vector<SplittingInterval> & /*splitter*/,
diff --git a/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h b/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
index 0c8a0b62125812a0905046f8b2fb77d668b9195c..eef3f5a5d68dd7f839188b1d22c9d907d7e5a35a 100644
--- a/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
@@ -4,11 +4,11 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/DllConfig.h"
#include "MantidKernel/ITimeSeriesProperty.h"
#include "MantidKernel/Property.h"
#include "MantidKernel/Statistics.h"
+#include "MantidTypes/DateAndTime.h"
#include <cstdint>
#include <utility>
@@ -49,11 +49,11 @@ struct TimeSeriesPropertyStatistics {
*/
template <class TYPE> class TimeValueUnit {
private:
- Kernel::DateAndTime mtime;
+ Mantid::Types::DateAndTime mtime;
TYPE mvalue;
public:
- TimeValueUnit(const Kernel::DateAndTime &time, TYPE value) {
+ TimeValueUnit(const Mantid::Types::DateAndTime &time, TYPE value) {
mtime = time;
mvalue = value;
}
@@ -78,9 +78,9 @@ public:
return (lhs.mtime < rhs.mtime);
}
- Kernel::DateAndTime time() const { return mtime; }
+ Mantid::Types::DateAndTime time() const { return mtime; }
- void setTime(Kernel::DateAndTime newtime) { mtime = newtime; }
+ void setTime(Mantid::Types::DateAndTime newtime) { mtime = newtime; }
TYPE value() const { return mvalue; }
@@ -154,8 +154,8 @@ public:
void setName(const std::string name);
/// Filter out a run by time.
- void filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop) override;
+ void filterByTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop) override;
/// Filter by a range of times
void filterByTimes(const std::vector<SplittingInterval> &splittervec);
@@ -165,9 +165,10 @@ public:
bool isPeriodic) const override;
/// New split method
- void splitByTimeVector(std::vector<DateAndTime> &splitter_time_vec,
- std::vector<int> &target_vec,
- std::vector<TimeSeriesProperty *> outputs);
+ void
+ splitByTimeVector(std::vector<Mantid::Types::DateAndTime> &splitter_time_vec,
+ std::vector<int> &target_vec,
+ std::vector<TimeSeriesProperty *> outputs);
/// Fill a TimeSplitterType that will filter the events by matching
void makeFilterByValue(std::vector<SplittingInterval> &split, double min,
@@ -183,47 +184,47 @@ public:
/// Calculate the time-weighted average of a property
double timeAverageValue() const override;
/// generate constant time-step histogram from the property values
- void histogramData(const Kernel::DateAndTime &tMin,
- const Kernel::DateAndTime &tMax,
+ void histogramData(const Mantid::Types::DateAndTime &tMin,
+ const Mantid::Types::DateAndTime &tMax,
std::vector<double> &counts) const;
/// Return the time series as a correct C++ map<DateAndTime, TYPE>. All
/// values
- std::map<DateAndTime, TYPE> valueAsCorrectMap() const;
+ std::map<Mantid::Types::DateAndTime, TYPE> valueAsCorrectMap() const;
/// Return the time series's values (unfiltered) as a vector<TYPE>
std::vector<TYPE> valuesAsVector() const;
/// Return the time series as a correct C++ multimap<DateAndTime, TYPE>. All
/// values
- std::multimap<DateAndTime, TYPE> valueAsMultiMap() const;
+ std::multimap<Mantid::Types::DateAndTime, TYPE> valueAsMultiMap() const;
/// Get filtered values as a vector
std::vector<TYPE> filteredValuesAsVector() const;
/// Return the time series's times as a vector<DateAndTime>
- std::vector<DateAndTime> timesAsVector() const override;
+ std::vector<Mantid::Types::DateAndTime> timesAsVector() const override;
/// Return the series as list of times, where the time is the number of
/// seconds since the start.
std::vector<double> timesAsVectorSeconds() const;
/// Add a value to the map using a DateAndTime object
- void addValue(const Kernel::DateAndTime &time, const TYPE value);
+ void addValue(const Mantid::Types::DateAndTime &time, const TYPE value);
/// Add a value to the map using a string time
void addValue(const std::string &time, const TYPE value);
/// Add a value to the map using a time_t
void addValue(const std::time_t &time, const TYPE value);
/// Adds vectors of values to the map. Should be much faster than repeated
/// calls to addValue.
- void addValues(const std::vector<Kernel::DateAndTime> ×,
+ void addValues(const std::vector<Mantid::Types::DateAndTime> ×,
const std::vector<TYPE> &values);
/// Replaces the time series with new values time series values
- void replaceValues(const std::vector<Kernel::DateAndTime> ×,
+ void replaceValues(const std::vector<Mantid::Types::DateAndTime> ×,
const std::vector<TYPE> &values);
/// Returns the last time
- DateAndTime lastTime() const;
+ Mantid::Types::DateAndTime lastTime() const;
/// Returns the first value regardless of filter
TYPE firstValue() const;
/// Returns the first time regardless of filter
- DateAndTime firstTime() const;
+ Mantid::Types::DateAndTime firstTime() const;
/// Returns the last value
TYPE lastValue() const;
@@ -244,7 +245,7 @@ public:
/// New method to return time series value pairs as std::vector<std::string>
std::vector<std::string> time_tValue() const;
/// Return the time series as a C++ map<DateAndTime, TYPE>
- std::map<DateAndTime, TYPE> valueAsMap() const;
+ std::map<Mantid::Types::DateAndTime, TYPE> valueAsMap() const;
// ============================================================================================
/// Set a property from a string
@@ -257,24 +258,24 @@ public:
/// Deletes all but the 'last entry' in the property
void clearOutdated() override;
/// Clears and creates a TimeSeriesProperty from these parameters
- void create(const Kernel::DateAndTime &start_time,
+ void create(const Mantid::Types::DateAndTime &start_time,
const std::vector<double> &time_sec,
const std::vector<TYPE> &new_values);
/// Clears and creates a TimeSeriesProperty from these parameters
- void create(const std::vector<DateAndTime> &new_times,
+ void create(const std::vector<Mantid::Types::DateAndTime> &new_times,
const std::vector<TYPE> &new_values);
/// Returns the value at a particular time
- TYPE getSingleValue(const DateAndTime &t) const;
+ TYPE getSingleValue(const Mantid::Types::DateAndTime &t) const;
/// Returns the value at a particular time
- TYPE getSingleValue(const DateAndTime &t, int &index) const;
+ TYPE getSingleValue(const Mantid::Types::DateAndTime &t, int &index) const;
/// Returns n-th valid time interval, in a very inefficient way.
TimeInterval nthInterval(int n) const;
/// Returns n-th value of n-th interval in an incredibly inefficient way.
TYPE nthValue(int n) const;
/// Returns n-th time. NOTE: Complexity is order(n)! regardless of filter
- Kernel::DateAndTime nthTime(int n) const;
+ Mantid::Types::DateAndTime nthTime(int n) const;
/// Divide the property into allowed and disallowed time intervals according
/// to \a filter.
@@ -306,8 +307,8 @@ public:
std::string toString() const;
/**Reserve memory for efficient adding values to existing property
- * makes sense only when you have reasonably precise estimate of the
- * total size you'll need easily available in advance. */
+ * makes sense only when you have reasonably precise estimate of the
+ * total size you'll need easily available in advance. */
void reserve(size_t size) { m_values.reserve(size); };
/// If filtering by log, get the time intervals for splitting
@@ -320,9 +321,9 @@ private:
/// Sort the property into increasing times, if not already sorted
void sortIfNecessary() const;
/// Find the index of the entry of time t in the mP vector (sorted)
- int findIndex(Kernel::DateAndTime t) const;
+ int findIndex(Mantid::Types::DateAndTime t) const;
/// Find the upper_bound of time t in container.
- int upperBound(Kernel::DateAndTime t, int istart, int iend) const;
+ int upperBound(Mantid::Types::DateAndTime t, int istart, int iend) const;
/// Apply a filter
void applyFilter() const;
/// A new algorithm to find Nth index. It is simple and leave a lot work to
@@ -331,7 +332,7 @@ private:
/// Set a value from another property
std::string setValueFromProperty(const Property &right) override;
/// Find if time lies in a filtered region
- bool isTimeFiltered(const Kernel::DateAndTime &time) const;
+ bool isTimeFiltered(const Mantid::Types::DateAndTime &time) const;
/// Holds the time series data
mutable std::vector<TimeValueUnit<TYPE>> m_values;
@@ -344,7 +345,7 @@ private:
mutable TimeSeriesSortStatus m_propSortedFlag;
/// The filter
- mutable std::vector<std::pair<Kernel::DateAndTime, bool>> m_filter;
+ mutable std::vector<std::pair<Mantid::Types::DateAndTime, bool>> m_filter;
/// Quick reference regions for filter
mutable std::vector<std::pair<size_t, size_t>> m_filterQuickRef;
/// True if a filter has been applied
diff --git a/Framework/Kernel/inc/MantidKernel/TimeSplitter.h b/Framework/Kernel/inc/MantidKernel/TimeSplitter.h
index bfc45560d599349fd599cfc36f00e180ecbf61e8..73cac82324b1b213cd0d3f803bdacc2c48f216ff 100644
--- a/Framework/Kernel/inc/MantidKernel/TimeSplitter.h
+++ b/Framework/Kernel/inc/MantidKernel/TimeSplitter.h
@@ -1,7 +1,8 @@
#ifndef TIMESPLITTER_H
#define TIMESPLITTER_H
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DllConfig.h"
+#include "MantidTypes/DateAndTime.h"
namespace Mantid {
namespace Kernel {
@@ -20,11 +21,12 @@ public:
/// Default constructor
SplittingInterval();
- SplittingInterval(const DateAndTime &start, const DateAndTime &stop,
+ SplittingInterval(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop,
const int index = 0);
- DateAndTime start() const;
- DateAndTime stop() const;
+ Mantid::Types::DateAndTime start() const;
+ Mantid::Types::DateAndTime stop() const;
double duration() const;
@@ -41,9 +43,9 @@ public:
private:
/// begin
- DateAndTime m_start;
+ Mantid::Types::DateAndTime m_start;
/// end
- DateAndTime m_stop;
+ Mantid::Types::DateAndTime m_stop;
/// Index of the destination
int m_index;
};
@@ -56,12 +58,12 @@ private:
typedef std::vector<SplittingInterval> TimeSplitterType;
// -------------- Operators ---------------------
-MANTID_KERNEL_DLL TimeSplitterType
-operator+(const TimeSplitterType &a, const TimeSplitterType &b);
-MANTID_KERNEL_DLL TimeSplitterType
-operator&(const TimeSplitterType &a, const TimeSplitterType &b);
-MANTID_KERNEL_DLL TimeSplitterType
-operator|(const TimeSplitterType &a, const TimeSplitterType &b);
+MANTID_KERNEL_DLL TimeSplitterType operator+(const TimeSplitterType &a,
+ const TimeSplitterType &b);
+MANTID_KERNEL_DLL TimeSplitterType operator&(const TimeSplitterType &a,
+ const TimeSplitterType &b);
+MANTID_KERNEL_DLL TimeSplitterType operator|(const TimeSplitterType &a,
+ const TimeSplitterType &b);
MANTID_KERNEL_DLL TimeSplitterType operator~(const TimeSplitterType &a);
} // Namespace Kernel
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 59ca2639dfb3f5ecfb7605f28ae18f7c238ddf6a..9cd1e744df1fa9c3b6acfd923fef78c8c0e23f8e 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -3,30 +3,30 @@
//----------------------------------------------------------------------
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/MantidVersion.h"
-#include "MantidKernel/Strings.h"
-#include "MantidKernel/Logger.h"
-#include "MantidKernel/FilterChannel.h"
-#include "MantidKernel/StdoutChannel.h"
-#include "MantidKernel/System.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/FacilityInfo.h"
+#include "MantidKernel/FilterChannel.h"
+#include "MantidKernel/Logger.h"
+#include "MantidKernel/MantidVersion.h"
#include "MantidKernel/NetworkProxy.h"
+#include "MantidKernel/StdoutChannel.h"
+#include "MantidKernel/Strings.h"
+#include "MantidKernel/System.h"
+#include "MantidTypes/DateAndTime.h"
-#include <Poco/Util/LoggingConfigurator.h>
-#include <Poco/Util/SystemConfiguration.h>
-#include <Poco/Util/PropertyFileConfiguration.h>
-#include <Poco/LoggingFactory.h>
-#include <Poco/Path.h>
-#include <Poco/File.h>
#include <MantidKernel/StringTokenizer.h>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h>
#include <Poco/DOM/NodeList.h>
#include <Poco/Environment.h>
+#include <Poco/File.h>
+#include <Poco/LoggingFactory.h>
+#include <Poco/Path.h>
#include <Poco/Process.h>
#include <Poco/URI.h>
+#include <Poco/Util/LoggingConfigurator.h>
+#include <Poco/Util/PropertyFileConfiguration.h>
+#include <Poco/Util/SystemConfiguration.h>
#include <Poco/AutoPtr.h>
#include <Poco/Channel.h>
@@ -34,25 +34,25 @@
#include <Poco/DOM/Node.h>
#include <Poco/Exception.h>
#include <Poco/Instantiator.h>
-#include <Poco/Pipe.h>
-#include <Poco/Platform.h>
-#include <Poco/String.h>
#include <Poco/Logger.h>
#include <Poco/LoggingRegistry.h>
+#include <Poco/Pipe.h>
#include <Poco/PipeStream.h>
+#include <Poco/Platform.h>
#include <Poco/StreamCopier.h>
+#include <Poco/String.h>
#include <boost/algorithm/string/join.hpp>
#include <boost/regex.hpp>
#include <algorithm>
+#include <ctype.h>
#include <exception>
#include <fstream>
#include <functional>
#include <iostream>
#include <stdexcept>
#include <utility>
-#include <ctype.h>
#ifdef __APPLE__
#include <mach-o/dyld.h>
@@ -242,8 +242,9 @@ ConfigServiceImpl::ConfigServiceImpl()
g_log.information() << "This is Mantid version " << MantidVersion::version()
<< " revision " << MantidVersion::revision() << '\n';
g_log.information() << "running on " << getComputerName() << " starting "
- << DateAndTime::getCurrentTime().toFormattedString(
- "%Y-%m-%dT%H:%MZ") << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime()
+ .toFormattedString("%Y-%m-%dT%H:%MZ")
+ << "\n";
g_log.information() << "Properties file(s) loaded: " << propertiesFilesList
<< '\n';
#ifndef MPI_BUILD // There is no logging to file by default in MPI build
@@ -427,11 +428,11 @@ bool ConfigServiceImpl::readFile(const std::string &filename,
}
/** Registers additional logging filter channels
-* @param filterChannelName The name to refer to the filter channel, this should
-* be unique
-* @param pChannel a pointer to the channel to be registered, if blank, then the
-* channel must already be registered with the logging registry in Poco
-*/
+ * @param filterChannelName The name to refer to the filter channel, this should
+ * be unique
+ * @param pChannel a pointer to the channel to be registered, if blank, then the
+ * channel must already be registered with the logging registry in Poco
+ */
void ConfigServiceImpl::registerLoggingFilterChannel(
const std::string &filterChannelName, Poco::Channel *pChannel) {
m_filterChannels.push_back(filterChannelName);
@@ -1002,13 +1003,13 @@ void ConfigServiceImpl::getKeysRecursive(
}
/**
-* Recursively gets a list of all config options.
-*
-* This function is needed as Boost Python does not like calling function with
-* default arguments.
-*
-* @return Vector containing all config options
-*/
+ * Recursively gets a list of all config options.
+ *
+ * This function is needed as Boost Python does not like calling function with
+ * default arguments.
+ *
+ * @return Vector containing all config options
+ */
std::vector<std::string> ConfigServiceImpl::keys() const {
std::vector<std::string> allKeys;
getKeysRecursive("", allKeys);
@@ -1387,9 +1388,9 @@ std::string ConfigServiceImpl::getTempDir() {
}
/** Gets the absolute path of the appdata directory
-*
-* @returns The absolute path of the appdata directory
-*/
+ *
+ * @returns The absolute path of the appdata directory
+ */
std::string ConfigServiceImpl::getAppDataDir() {
const std::string applicationName = "mantid";
#if POCO_OS == POCO_OS_WINDOWS_NT
@@ -1417,10 +1418,10 @@ std::string ConfigServiceImpl::getDirectoryOfExecutable() const {
}
/**
- * Get the full path to the executing program (i.e. whatever Mantid is embedded
+ * Get the full path to the executing program (i.e. whatever Mantid is embedded
* in)
- * @returns A string containing the full path the the executable
- */
+ * @returns A string containing the full path the the executable
+ */
std::string ConfigServiceImpl::getPathToExecutable() const {
std::string execpath;
const size_t LEN(1024);
@@ -1657,9 +1658,9 @@ const std::vector<std::string> &ConfigServiceImpl::getUserSearchDirs() const {
}
/**
-* Sets the search directories for XML instrument definition files (IDFs)
-* @param directories An ordered list of paths for instrument searching
-*/
+ * Sets the search directories for XML instrument definition files (IDFs)
+ * @param directories An ordered list of paths for instrument searching
+ */
void ConfigServiceImpl::setInstrumentDirectories(
const std::vector<std::string> &directories) {
m_InstrumentDirs = directories;
@@ -2040,24 +2041,27 @@ Kernel::ProxyInfo &ConfigServiceImpl::getProxy(const std::string &url) {
}
/** Sets the log level priority for the File log channel
-* @param logLevel the integer value of the log level to set, 1=Critical, 7=Debug
-*/
+ * @param logLevel the integer value of the log level to set, 1=Critical,
+ * 7=Debug
+ */
void ConfigServiceImpl::setFileLogLevel(int logLevel) {
setFilterChannelLogLevel(m_filterChannels[0], logLevel);
}
/** Sets the log level priority for the Console log channel
-* @param logLevel the integer value of the log level to set, 1=Critical, 7=Debug
-*/
+ * @param logLevel the integer value of the log level to set, 1=Critical,
+ * 7=Debug
+ */
void ConfigServiceImpl::setConsoleLogLevel(int logLevel) {
setFilterChannelLogLevel(m_filterChannels[1], logLevel);
}
/** Sets the Log level for a filter channel
-* @param filterChannelName the channel name of the filter channel to change
-* @param logLevel the integer value of the log level to set, 1=Critical, 7=Debug
-* @throws std::invalid_argument if the channel name is incorrect or it is not a
-* filterChannel
-*/
+ * @param filterChannelName the channel name of the filter channel to change
+ * @param logLevel the integer value of the log level to set, 1=Critical,
+ * 7=Debug
+ * @throws std::invalid_argument if the channel name is incorrect or it is not a
+ * filterChannel
+ */
void ConfigServiceImpl::setFilterChannelLogLevel(
const std::string &filterChannelName, int logLevel) {
Poco::Channel *channel = nullptr;
@@ -2088,7 +2092,7 @@ void ConfigServiceImpl::setFilterChannelLogLevel(
}
/** Finds the lowest Log level for all registered filter channels
-*/
+ */
int ConfigServiceImpl::FindLowestFilterLevel() const {
int lowestPriority = Logger::Priority::PRIO_FATAL;
// Find the lowest level of all of the filter channels
diff --git a/Framework/Kernel/src/GitHubApiHelper.cpp b/Framework/Kernel/src/GitHubApiHelper.cpp
index 80c22b8871e762313b6f08482a4566d0498f1767..90a125426f94bcb584a7ab59e9de697b8faafd20 100644
--- a/Framework/Kernel/src/GitHubApiHelper.cpp
+++ b/Framework/Kernel/src/GitHubApiHelper.cpp
@@ -1,11 +1,11 @@
#include "MantidKernel/GitHubApiHelper.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/Logger.h"
-#include <Poco/StreamCopier.h>
-#include <Poco/URI.h>
+#include "MantidTypes/DateAndTime.h"
+#include <Poco/Net/HTTPClientSession.h>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Net/HTTPResponse.h>
-#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/StreamCopier.h>
+#include <Poco/URI.h>
#include <boost/lexical_cast.hpp>
@@ -27,18 +27,18 @@ namespace {
// anonymous namespace for some utility functions
/// static Logger object
Logger g_log("InternetHelper");
-}
+} // namespace
//----------------------------------------------------------------------------------------------
/** Constructor
-*/
+ */
GitHubApiHelper::GitHubApiHelper() : InternetHelper() {
addAuthenticationToken();
}
//----------------------------------------------------------------------------------------------
/** Constructor
-*/
+ */
GitHubApiHelper::GitHubApiHelper(const Kernel::ProxyInfo &proxy)
: InternetHelper(proxy) {
addAuthenticationToken();
@@ -58,7 +58,7 @@ void GitHubApiHelper::processResponseHeaders(
// get github api rate limit information if available;
int rateLimitRemaining = 0;
int rateLimitLimit;
- DateAndTime rateLimitReset;
+ Mantid::Types::DateAndTime rateLimitReset;
try {
rateLimitLimit =
boost::lexical_cast<int>(res.get("X-RateLimit-Limit", "-1"));
diff --git a/Framework/Kernel/src/InternetHelper.cpp b/Framework/Kernel/src/InternetHelper.cpp
index 6a132d853c9da8c463b26731d78f3c0f454c361b..060830db60229ad9bfc45b6ba5871b7f435c5f84 100644
--- a/Framework/Kernel/src/InternetHelper.cpp
+++ b/Framework/Kernel/src/InternetHelper.cpp
@@ -1,16 +1,16 @@
#include "MantidKernel/InternetHelper.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
+#include "MantidTypes/DateAndTime.h"
// Poco
#include <Poco/Net/AcceptCertificateHandler.h>
-#include <Poco/Net/NetException.h>
#include <Poco/Net/HTMLForm.h>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Net/HTTPResponse.h>
#include <Poco/Net/HTTPSClientSession.h>
+#include <Poco/Net/NetException.h>
#include <Poco/Net/PrivateKeyPassphraseHandler.h>
#include <Poco/Net/SSLManager.h>
#include <Poco/StreamCopier.h>
@@ -35,10 +35,12 @@
#include <boost/lexical_cast.hpp>
// std
-#include <mutex>
#include <fstream>
+#include <mutex>
#include <utility>
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace Kernel {
@@ -77,11 +79,11 @@ void doSSLInit() {
* initialization only happens once per process.
*/
void initializeSSL() { std::call_once(SSL_INIT_FLAG, doSSLInit); }
-}
+} // namespace
//----------------------------------------------------------------------------------------------
/** Constructor
-*/
+ */
InternetHelper::InternetHelper()
: m_proxyInfo(), m_isProxySet(false), m_timeout(30), m_isTimeoutSet(false),
m_contentLength(0), m_method(HTTPRequest::HTTP_GET),
@@ -90,7 +92,7 @@ InternetHelper::InternetHelper()
//----------------------------------------------------------------------------------------------
/** Constructor
-*/
+ */
InternetHelper::InternetHelper(const Kernel::ProxyInfo &proxy)
: m_proxyInfo(proxy), m_isProxySet(true), m_timeout(30),
m_isTimeoutSet(false), m_contentLength(0),
@@ -99,7 +101,7 @@ InternetHelper::InternetHelper(const Kernel::ProxyInfo &proxy)
//----------------------------------------------------------------------------------------------
/** Destructor
-*/
+ */
InternetHelper::~InternetHelper() {
if (m_request != nullptr) {
delete m_request;
@@ -188,9 +190,9 @@ int InternetHelper::processRelocation(const HTTPResponse &response,
}
/** Performs a request using http or https depending on the url
-* @param url the address to the network resource
-* @param responseStream The stream to fill with the reply on success
-**/
+ * @param url the address to the network resource
+ * @param responseStream The stream to fill with the reply on success
+ **/
int InternetHelper::sendRequest(const std::string &url,
std::ostream &responseStream) {
@@ -230,9 +232,9 @@ void InternetHelper::logDebugRequestSending(const std::string &schemeName,
}
/** Performs a request using http
-* @param url the address to the network resource
-* @param responseStream The stream to fill with the reply on success
-**/
+ * @param url the address to the network resource
+ * @param responseStream The stream to fill with the reply on success
+ **/
int InternetHelper::sendHTTPRequest(const std::string &url,
std::ostream &responseStream) {
int retStatus = 0;
@@ -260,9 +262,9 @@ int InternetHelper::sendHTTPRequest(const std::string &url,
}
/** Performs a request using https
-* @param url the address to the network resource
-* @param responseStream The stream to fill with the reply on success
-**/
+ * @param url the address to the network resource
+ * @param responseStream The stream to fill with the reply on success
+ **/
int InternetHelper::sendHTTPSRequest(const std::string &url,
std::ostream &responseStream) {
int retStatus = 0;
@@ -311,7 +313,7 @@ Kernel::ProxyInfo &InternetHelper::getProxy(const std::string &url) {
}
/** Clears cached proxy details.
-*/
+ */
void InternetHelper::clearProxy() { m_isProxySet = false; }
/** sets the proxy details.
@@ -441,8 +443,8 @@ int InternetHelper::downloadFile(const std::string &urlFile,
}
/** Sets the timeout in seconds
-* @param seconds The value in seconds for the timeout
-**/
+ * @param seconds The value in seconds for the timeout
+ **/
void InternetHelper::setTimeout(int seconds) {
m_timeout = seconds;
m_isTimeoutSet = true;
@@ -472,8 +474,8 @@ void InternetHelper::throwNotConnected(const std::string &url,
}
/** Gets the timeout in seconds
-* @returns The value in seconds for the timeout
-**/
+ * @returns The value in seconds for the timeout
+ **/
int InternetHelper::getTimeout() {
if (!m_isTimeoutSet) {
if (!ConfigService::Instance().getValue("network.default.timeout",
@@ -485,9 +487,9 @@ int InternetHelper::getTimeout() {
}
/** Sets the Method
-* @param method A string of GET or POST, anything other than POST is considered
-*GET
-**/
+ * @param method A string of GET or POST, anything other than POST is considered
+ *GET
+ **/
void InternetHelper::setMethod(const std::string &method) {
if (method == "POST") {
m_method = method;
@@ -497,39 +499,39 @@ void InternetHelper::setMethod(const std::string &method) {
}
/** Gets the method
-* @returns either "GET" or "POST"
-**/
+ * @returns either "GET" or "POST"
+ **/
const std::string &InternetHelper::getMethod() { return m_method; }
/** Sets the Content Type
-* @param contentType A string of the content type
-**/
+ * @param contentType A string of the content type
+ **/
void InternetHelper::setContentType(const std::string &contentType) {
m_contentType = contentType;
}
/** Gets the Content Type
-* @returns A string of the content type
-**/
+ * @returns A string of the content type
+ **/
const std::string &InternetHelper::getContentType() { return m_contentType; }
/** Sets the content length
-* @param length The content length in bytes
-**/
+ * @param length The content length in bytes
+ **/
void InternetHelper::setContentLength(std::streamsize length) {
m_contentLength = length;
}
/** Gets the content length
-* @returns The content length in bytes
-**/
+ * @returns The content length in bytes
+ **/
std::streamsize InternetHelper::getContentLength() { return m_contentLength; }
/** Sets the body & content length for future requests, this will also
-* set the method to POST is the body is not empty
-* and GET if it is.
-* @param body A string of the body
-**/
+ * set the method to POST is the body is not empty
+ * and GET if it is.
+ * @param body A string of the body
+ **/
void InternetHelper::setBody(const std::string &body) {
m_body = body;
if (m_body.empty()) {
@@ -541,19 +543,19 @@ void InternetHelper::setBody(const std::string &body) {
}
/** Sets the body & content length for future requests, this will also
-* set the method to POST is the body is not empty
-* and GET if it is.
-* @param body A stringstream of the body
-**/
+ * set the method to POST is the body is not empty
+ * and GET if it is.
+ * @param body A stringstream of the body
+ **/
void InternetHelper::setBody(const std::ostringstream &body) {
setBody(body.str());
}
/** Sets the body & content length for future requests, this will also
-* set the method to POST is the body is not empty
-* and GET if it is.
-* @param form A HTMLform
-**/
+ * set the method to POST is the body is not empty
+ * and GET if it is.
+ * @param form A HTMLform
+ **/
void InternetHelper::setBody(Poco::Net::HTMLForm &form) {
setMethod("POST");
@@ -571,58 +573,58 @@ void InternetHelper::setBody(Poco::Net::HTMLForm &form) {
}
/** Gets the body set for future requests
-* @returns A string of the content type
-**/
+ * @returns A string of the content type
+ **/
const std::string &InternetHelper::getBody() { return m_body; }
/** Gets the body set for future requests
-* @returns A string of the content type
-**/
+ * @returns A string of the content type
+ **/
int InternetHelper::getResponseStatus() { return m_response->getStatus(); }
/** Gets the body set for future requests
-* @returns A string of the content type
-**/
+ * @returns A string of the content type
+ **/
const std::string &InternetHelper::getResponseReason() {
return m_response->getReason();
}
/** Adds a header
-* @param key The key to refer to the value
-* @param value The value in seconds for the timeout
-**/
+ * @param key The key to refer to the value
+ * @param value The value in seconds for the timeout
+ **/
void InternetHelper::addHeader(const std::string &key,
const std::string &value) {
m_headers.emplace(key, value);
}
/** Removes a header
-* @param key The key to refer to the value
-**/
+ * @param key The key to refer to the value
+ **/
void InternetHelper::removeHeader(const std::string &key) {
m_headers.erase(key);
}
/** Gets the value of a header
-* @param key The key to refer to the value
-* @returns the value as a string
-**/
+ * @param key The key to refer to the value
+ * @returns the value as a string
+ **/
const std::string &InternetHelper::getHeader(const std::string &key) {
return m_headers[key];
}
/** Clears all headers
-**/
+ **/
void InternetHelper::clearHeaders() { m_headers.clear(); }
/** Returns a reference to the headers map
-**/
+ **/
std::map<std::string, std::string> &InternetHelper::headers() {
return m_headers;
}
/** Resets properties to defaults (except the proxy)
-**/
+ **/
void InternetHelper::reset() {
m_headers.clear();
m_timeout = 30;
diff --git a/Framework/Kernel/src/LogFilter.cpp b/Framework/Kernel/src/LogFilter.cpp
index 3a868ba2b316745510015dc812b053d874f02368..710d1f1c50af2131f0d134fea2afde5953422ebc 100644
--- a/Framework/Kernel/src/LogFilter.cpp
+++ b/Framework/Kernel/src/LogFilter.cpp
@@ -1,5 +1,6 @@
#include "MantidKernel/LogFilter.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/TimeInterval.h"
namespace Mantid {
namespace Kernel {
diff --git a/Framework/Kernel/src/LogParser.cpp b/Framework/Kernel/src/LogParser.cpp
index 0becfc1ffa73b9a8930f579fa3361f732ac7232b..e742feea31117584ccb998f5d2ffd4c83b38967e 100644
--- a/Framework/Kernel/src/LogParser.cpp
+++ b/Framework/Kernel/src/LogParser.cpp
@@ -2,9 +2,10 @@
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/LogParser.h"
-#include "MantidKernel/Strings.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/PropertyWithValue.h"
+#include "MantidKernel/Strings.h"
+#include "MantidKernel/TimeInterval.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <fstream>
@@ -13,6 +14,7 @@
const char *START_COLLECTION = "START_COLLECTION";
const char *STOP_COLLECTION = "STOP_COLLECTION";
+using Mantid::Types::DateAndTime;
using std::size_t;
namespace Mantid {
@@ -20,7 +22,7 @@ namespace Kernel {
namespace {
/// static logger
Logger g_log("LogParser");
-}
+} // namespace
/// @returns the name of the log created that defines the status during a run
const std::string LogParser::statusLogName() { return std::string("running"); }
@@ -157,7 +159,8 @@ Try to pass the periods
@param idata : stream of input data
@param periods : periods data to update
*/
-void LogParser::tryParsePeriod(const std::string &scom, const DateAndTime &time,
+void LogParser::tryParsePeriod(const std::string &scom,
+ const Types::DateAndTime &time,
std::istringstream &idata,
Kernel::TimeSeriesProperty<int> *const periods) {
int ip = -1;
@@ -187,8 +190,8 @@ void LogParser::tryParsePeriod(const std::string &scom, const DateAndTime &time,
}
/** Create given the icpevent log property.
-* @param log :: A pointer to the property
-*/
+ * @param log :: A pointer to the property
+ */
LogParser::LogParser(const Kernel::Property *log) : m_nOfPeriods(1) {
Kernel::TimeSeriesProperty<int> *periods =
new Kernel::TimeSeriesProperty<int>(periodsLogName());
@@ -200,14 +203,14 @@ LogParser::LogParser(const Kernel::Property *log) : m_nOfPeriods(1) {
const Kernel::TimeSeriesProperty<std::string> *icpLog =
dynamic_cast<const Kernel::TimeSeriesProperty<std::string> *>(log);
if (!icpLog || icpLog->size() == 0) {
- periods->addValue(Kernel::DateAndTime(), 1);
- status->addValue(Kernel::DateAndTime(), true);
+ periods->addValue(Mantid::Types::DateAndTime(), 1);
+ status->addValue(Mantid::Types::DateAndTime(), true);
g_log.warning()
<< "Cannot process ICPevent log. Period 1 assumed for all data.\n";
return;
}
- std::multimap<Kernel::DateAndTime, std::string> logm =
+ std::multimap<Mantid::Types::DateAndTime, std::string> logm =
icpLog->valueAsMultiMap();
CommandMap command_map =
createCommandMap(LogParser::isICPEventLogNewStyle(logm));
@@ -258,7 +261,7 @@ Kernel::TimeSeriesProperty<bool> *LogParser::createPeriodLog(int period) const {
ostr << period;
Kernel::TimeSeriesProperty<bool> *p =
new Kernel::TimeSeriesProperty<bool>("period " + ostr.str());
- std::map<Kernel::DateAndTime, int> pMap = periods->valueAsMap();
+ std::map<Mantid::Types::DateAndTime, int> pMap = periods->valueAsMap();
auto it = pMap.begin();
if (it->second != period)
p->addValue(it->first, false);
@@ -271,7 +274,7 @@ Kernel::TimeSeriesProperty<bool> *LogParser::createPeriodLog(int period) const {
/**
* Create a log vale for the current period.
* @param period: The period number to create the log entry for.
-*/
+ */
Kernel::Property *LogParser::createCurrentPeriodLog(const int &period) const {
Kernel::PropertyWithValue<int> *currentPeriodProperty =
new Kernel::PropertyWithValue<int>("current_period", period);
@@ -291,13 +294,12 @@ Kernel::TimeSeriesProperty<bool> *LogParser::createRunningLog() const {
namespace {
/// Define operator for checking for new-style icp events
struct hasNewStyleCommands {
- bool
- operator()(const std::pair<Mantid::Kernel::DateAndTime, std::string> &p) {
+ bool operator()(const std::pair<Mantid::Types::DateAndTime, std::string> &p) {
return p.second.find(START_COLLECTION) != std::string::npos ||
p.second.find(STOP_COLLECTION) != std::string::npos;
}
};
-}
+} // namespace
/**
* Check if the icp log commands are in the new style. The new style is the one
@@ -306,7 +308,7 @@ struct hasNewStyleCommands {
* @param logm :: A log map created from a icp-event log.
*/
bool LogParser::isICPEventLogNewStyle(
- const std::multimap<Kernel::DateAndTime, std::string> &logm) {
+ const std::multimap<Mantid::Types::DateAndTime, std::string> &logm) {
hasNewStyleCommands checker;
return std::find_if(logm.begin(), logm.end(), checker) != logm.end();
@@ -322,7 +324,7 @@ bool LogParser::isICPEventLogNewStyle(
* TimeSeriesProperty<double>.
* @return The mean value over time.
* @throw runtime_error if the property is not TimeSeriesProperty<double>
-*/
+ */
double timeMean(const Kernel::Property *p) {
const Kernel::TimeSeriesProperty<double> *dp =
dynamic_cast<const Kernel::TimeSeriesProperty<double> *>(p);
@@ -336,17 +338,17 @@ double timeMean(const Kernel::Property *p) {
return dp->nthValue(1);
}
double res = 0.;
- Kernel::time_duration total(0, 0, 0, 0);
+ Types::time_duration total(0, 0, 0, 0);
size_t dp_size = dp->size();
for (size_t i = 0; i < dp_size; i++) {
Kernel::TimeInterval t = dp->nthInterval(static_cast<int>(i));
- Kernel::time_duration dt = t.length();
+ Types::time_duration dt = t.length();
total += dt;
res += dp->nthValue(static_cast<int>(i)) *
- Kernel::DateAndTime::secondsFromDuration(dt);
+ Mantid::Types::DateAndTime::secondsFromDuration(dt);
}
- double total_seconds = Kernel::DateAndTime::secondsFromDuration(total);
+ double total_seconds = Mantid::Types::DateAndTime::secondsFromDuration(total);
// If all the time stamps were the same, just return the first value.
if (total_seconds == 0.0)
@@ -358,5 +360,5 @@ double timeMean(const Kernel::Property *p) {
return res;
}
-} // namespace Geometry
+} // namespace Kernel
} // namespace Mantid
diff --git a/Framework/Kernel/src/Property.cpp b/Framework/Kernel/src/Property.cpp
index d375e00ac2d94b84f43b93eb4db658805ab99f78..1f27cf0a400a056a1ba512d114c8d0568aa4fe2f 100644
--- a/Framework/Kernel/src/Property.cpp
+++ b/Framework/Kernel/src/Property.cpp
@@ -1,6 +1,6 @@
#include "MantidKernel/Property.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/IPropertySettings.h"
#include "MantidKernel/OptionalBool.h"
@@ -209,8 +209,8 @@ void Property::setUnits(const std::string &unit) { m_units = unit; }
* @param start :: the beginning time to filter from
* @param stop :: the ending time to filter to
* */
-void Property::filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop) {
+void Property::filterByTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop) {
UNUSED_ARG(start);
UNUSED_ARG(stop);
// Do nothing in general
diff --git a/Framework/Kernel/src/PropertyManager.cpp b/Framework/Kernel/src/PropertyManager.cpp
index 18ab6f5c1c2cb8d11a417817320186dee72e14f1..d5a185661bbacd692cc8f509fc178a66899c4d79 100644
--- a/Framework/Kernel/src/PropertyManager.cpp
+++ b/Framework/Kernel/src/PropertyManager.cpp
@@ -97,8 +97,8 @@ PropertyManager &PropertyManager::operator+=(const PropertyManager &rhs) {
* @param stop :: Absolute stop time. Any log entries at times < than this time
*are kept.
*/
-void PropertyManager::filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop) {
+void PropertyManager::filterByTime(const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop) {
// Iterate through all properties
PropertyMap::const_iterator it;
for (it = this->m_properties.begin(); it != this->m_properties.end(); ++it) {
diff --git a/Framework/Kernel/src/PropertyNexus.cpp b/Framework/Kernel/src/PropertyNexus.cpp
index 21e1f1b6d48d8261053de2a98321fc00a66e0748..34cbe3907577e1736e7a42dc1b555f8b441dc771 100644
--- a/Framework/Kernel/src/PropertyNexus.cpp
+++ b/Framework/Kernel/src/PropertyNexus.cpp
@@ -1,10 +1,10 @@
#include "MantidKernel/PropertyNexus.h"
-#include <nexus/NeXusFile.hpp>
#include <nexus/NeXusException.hpp>
+#include <nexus/NeXusFile.hpp>
#include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Property.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -43,7 +43,7 @@ namespace PropertyNexus {
template <typename NumT>
std::unique_ptr<Property>
makeProperty(::NeXus::File *file, const std::string &name,
- const std::vector<Kernel::DateAndTime> ×) {
+ const std::vector<Mantid::Types::DateAndTime> ×) {
std::vector<NumT> values;
file->getData(values);
if (times.empty()) {
@@ -61,15 +61,15 @@ makeProperty(::NeXus::File *file, const std::string &name,
}
/** Helper method to create a time series property from a boolean
-*
-* @param file :: nexus file handle
-* @param name :: name of the property being created
-* @param times :: vector of times, empty = single property with value
-* @return Property *
-*/
-std::unique_ptr<Property>
-makeTimeSeriesBoolProperty(::NeXus::File *file, const std::string &name,
- const std::vector<Kernel::DateAndTime> ×) {
+ *
+ * @param file :: nexus file handle
+ * @param name :: name of the property being created
+ * @param times :: vector of times, empty = single property with value
+ * @return Property *
+ */
+std::unique_ptr<Property> makeTimeSeriesBoolProperty(
+ ::NeXus::File *file, const std::string &name,
+ const std::vector<Mantid::Types::DateAndTime> ×) {
std::vector<uint8_t> savedValues;
file->getData(savedValues);
const size_t nvals = savedValues.size();
@@ -85,7 +85,7 @@ makeTimeSeriesBoolProperty(::NeXus::File *file, const std::string &name,
/** Make a string/vector\<string\> property */
std::unique_ptr<Property>
makeStringProperty(::NeXus::File *file, const std::string &name,
- const std::vector<Kernel::DateAndTime> ×) {
+ const std::vector<Mantid::Types::DateAndTime> ×) {
std::vector<std::string> values;
if (times.empty()) {
std::string bigString = file->getStrData();
@@ -147,13 +147,13 @@ std::unique_ptr<Property> loadProperty(::NeXus::File *file,
typeIsBool = true;
}
- std::vector<Kernel::DateAndTime> times;
+ std::vector<Mantid::Types::DateAndTime> times;
if (!timeSec.empty()) {
// Use a default start time
if (startStr.empty())
startStr = "2000-01-01T00:00:00";
// Convert time in seconds to DateAndTime
- DateAndTime start(startStr);
+ auto start = Mantid::Types::DateAndTimeHelpers::createFromISO8601(startStr);
times.reserve(timeSec.size());
for (double time : timeSec) {
times.push_back(start + time);
@@ -216,5 +216,5 @@ std::unique_ptr<Property> loadProperty(::NeXus::File *file,
} // namespace PropertyNexus
+} // namespace Kernel
} // namespace Mantid
-} // namespace API
diff --git a/Framework/Kernel/src/TimeSeriesProperty.cpp b/Framework/Kernel/src/TimeSeriesProperty.cpp
index 62cebb4f722b5db5e21cebe2ff6845e4604e7574..61faecbb6463c3ea582e91efef6e95fe7505baca 100644
--- a/Framework/Kernel/src/TimeSeriesProperty.cpp
+++ b/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -1,19 +1,24 @@
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/EmptyValues.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
+#include "MantidKernel/TimeInterval.h"
#include "MantidKernel/TimeSplitter.h"
#include "MantidKernel/make_unique.h"
#include <nexus/NeXusFile.hpp>
#include <boost/regex.hpp>
+using namespace Mantid::Types;
+using Mantid::Types::time_duration;
+
namespace Mantid {
namespace Kernel {
namespace {
/// static Logger definition
Logger g_log("TimeSeriesProperty");
-}
+} // namespace
/**
* Constructor
@@ -55,13 +60,12 @@ TimeSeriesProperty<TYPE>::cloneWithTimeShift(const double timeShift) const {
}
/** Return time series property, containing time derivative of current property.
-* The property itself and the returned time derivative become sorted by time and
-* the derivative is calculated in seconds^-1.
-* (e.g. dValue/dT where dT=t2-t1 is time difference in seconds
-* for subsequent time readings and dValue=Val1-Val2 is difference in
-* subsequent values)
-*
-*/
+ * The property itself and the returned time derivative become sorted by time
+ * and the derivative is calculated in seconds^-1. (e.g. dValue/dT where
+ * dT=t2-t1 is time difference in seconds for subsequent time readings and
+ * dValue=Val1-Val2 is difference in subsequent values)
+ *
+ */
template <typename TYPE>
std::unique_ptr<TimeSeriesProperty<double>>
TimeSeriesProperty<TYPE>::getDerivative() const {
@@ -86,7 +90,7 @@ TimeSeriesProperty<TYPE>::getDerivative() const {
if (t1 != t0) {
double deriv = 1.e+9 * (double(v1 - v0) / double(t1 - t0));
int64_t tm = static_cast<int64_t>((t1 + t0) / 2);
- timeSeriesDeriv->addValue(Kernel::DateAndTime(tm), deriv);
+ timeSeriesDeriv->addValue(Mantid::Types::DateAndTime(tm), deriv);
}
t0 = t1;
v0 = v1;
@@ -257,8 +261,9 @@ void TimeSeriesProperty<TYPE>::setName(const std::string name) {
*are kept.
*/
template <typename TYPE>
-void TimeSeriesProperty<TYPE>::filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop) {
+void TimeSeriesProperty<TYPE>::filterByTime(
+ const Mantid::Types::DateAndTime &start,
+ const Mantid::Types::DateAndTime &stop) {
// 0. Sort
sortIfNecessary();
@@ -333,8 +338,8 @@ void TimeSeriesProperty<TYPE>::filterByTimes(
// 4. Create new
for (const auto &splitter : splittervec) {
- Kernel::DateAndTime t_start = splitter.start();
- Kernel::DateAndTime t_stop = splitter.stop();
+ Mantid::Types::DateAndTime t_start = splitter.start();
+ Mantid::Types::DateAndTime t_stop = splitter.stop();
int tstartindex = findIndex(t_start);
if (tstartindex < 0) {
@@ -535,7 +540,8 @@ void TimeSeriesProperty<TYPE>::splitByTimeVector(
errss << "Try to split TSP " << this->m_name
<< ": Input time vector's size " << splitter_time_vec.size()
<< " does not match (one more larger than) taget "
- "workspace index vector's size " << target_vec.size() << "\n";
+ "workspace index vector's size "
+ << target_vec.size() << "\n";
throw std::runtime_error(errss.str());
}
// return if the output vector TimeSeriesProperties is not defined
@@ -546,7 +552,7 @@ void TimeSeriesProperty<TYPE>::splitByTimeVector(
sortIfNecessary();
// work on m_values, m_size, and m_time
- std::vector<Kernel::DateAndTime> tsp_time_vec = this->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> tsp_time_vec = this->timesAsVector();
// go over both filter time vector and time series property time vector
size_t index_splitter = 0;
@@ -977,11 +983,11 @@ std::vector<TYPE> TimeSeriesProperty<TYPE>::valuesAsVector() const {
}
/**
- * Return the time series as a C++ multimap<DateAndTime, TYPE>. All values.
- * This method is used in parsing the ISIS ICPevent log file: different
+ * Return the time series as a C++ multimap<DateAndTime, TYPE>. All values.
+ * This method is used in parsing the ISIS ICPevent log file: different
* commands
- * can be recorded against the same time stamp but all must be present.
- */
+ * can be recorded against the same time stamp but all must be present.
+ */
template <typename TYPE>
std::multimap<DateAndTime, TYPE>
TimeSeriesProperty<TYPE>::valueAsMultiMap() const {
@@ -1027,7 +1033,7 @@ std::vector<double> TimeSeriesProperty<TYPE>::timesAsVectorSeconds() const {
std::vector<double> out;
out.reserve(m_values.size());
- Kernel::DateAndTime start = m_values[0].time();
+ Mantid::Types::DateAndTime start = m_values[0].time();
for (size_t i = 0; i < m_values.size(); i++) {
out.push_back(DateAndTime::secondsFromDuration(m_values[i].time() - start));
}
@@ -1041,7 +1047,7 @@ std::vector<double> TimeSeriesProperty<TYPE>::timesAsVectorSeconds() const {
* @param value The associated value
*/
template <typename TYPE>
-void TimeSeriesProperty<TYPE>::addValue(const Kernel::DateAndTime &time,
+void TimeSeriesProperty<TYPE>::addValue(const Mantid::Types::DateAndTime &time,
const TYPE value) {
TimeValueUnit<TYPE> newvalue(time, value);
// Add the value to the back of the vector
@@ -1077,7 +1083,7 @@ void TimeSeriesProperty<TYPE>::addValue(const Kernel::DateAndTime &time,
template <typename TYPE>
void TimeSeriesProperty<TYPE>::addValue(const std::string &time,
const TYPE value) {
- return addValue(Kernel::DateAndTime(time), value);
+ return addValue(DateAndTimeHelpers::createFromISO8601(time), value);
}
/**
@@ -1089,7 +1095,7 @@ void TimeSeriesProperty<TYPE>::addValue(const std::string &time,
template <typename TYPE>
void TimeSeriesProperty<TYPE>::addValue(const std::time_t &time,
const TYPE value) {
- Kernel::DateAndTime dt;
+ Mantid::Types::DateAndTime dt;
dt.set_from_time_t(time);
return addValue(dt, value);
}
@@ -1101,7 +1107,7 @@ void TimeSeriesProperty<TYPE>::addValue(const std::time_t &time,
*/
template <typename TYPE>
void TimeSeriesProperty<TYPE>::addValues(
- const std::vector<Kernel::DateAndTime> ×,
+ const std::vector<Mantid::Types::DateAndTime> ×,
const std::vector<TYPE> &values) {
size_t length = std::min(times.size(), values.size());
m_size += static_cast<int>(length);
@@ -1115,12 +1121,12 @@ void TimeSeriesProperty<TYPE>::addValues(
/** replace vectors of values to the map. First we clear the vectors
* and then we run addValues
-* @param times :: The time as a boost::posix_time::ptime value
-* @param values :: The associated value
-*/
+ * @param times :: The time as a boost::posix_time::ptime value
+ * @param values :: The associated value
+ */
template <typename TYPE>
void TimeSeriesProperty<TYPE>::replaceValues(
- const std::vector<Kernel::DateAndTime> ×,
+ const std::vector<Mantid::Types::DateAndTime> ×,
const std::vector<TYPE> &values) {
clear();
addValues(times, values);
@@ -1196,12 +1202,14 @@ template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::lastValue() const {
template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::minValue() const {
return std::min_element(m_values.begin(), m_values.end(),
- TimeValueUnit<TYPE>::valueCmp)->value();
+ TimeValueUnit<TYPE>::valueCmp)
+ ->value();
}
template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::maxValue() const {
return std::max_element(m_values.begin(), m_values.end(),
- TimeValueUnit<TYPE>::valueCmp)->value();
+ TimeValueUnit<TYPE>::valueCmp)
+ ->value();
}
/// Returns the number of values at UNIQUE time intervals in the time series
@@ -1352,9 +1360,9 @@ template <typename TYPE> void TimeSeriesProperty<TYPE>::clearOutdated() {
* Vector sizes must match.
*/
template <typename TYPE>
-void TimeSeriesProperty<TYPE>::create(const Kernel::DateAndTime &start_time,
- const std::vector<double> &time_sec,
- const std::vector<TYPE> &new_values) {
+void TimeSeriesProperty<TYPE>::create(
+ const Mantid::Types::DateAndTime &start_time,
+ const std::vector<double> &time_sec, const std::vector<TYPE> &new_values) {
if (time_sec.size() != new_values.size())
throw std::invalid_argument("TimeSeriesProperty::create: mismatched size "
"for the time and values vectors.");
@@ -1558,16 +1566,16 @@ TimeInterval TimeSeriesProperty<TYPE>::nthInterval(int n) const {
// 2. n = size of the allowed region, duplicate the last one
long ind_t1 = static_cast<long>(m_filterQuickRef.back().first);
long ind_t2 = ind_t1 - 1;
- Kernel::DateAndTime t1 = (m_values.begin() + ind_t1)->time();
- Kernel::DateAndTime t2 = (m_values.begin() + ind_t2)->time();
+ Mantid::Types::DateAndTime t1 = (m_values.begin() + ind_t1)->time();
+ Mantid::Types::DateAndTime t2 = (m_values.begin() + ind_t2)->time();
time_duration d = t1 - t2;
- Kernel::DateAndTime t3 = t1 + d;
+ Mantid::Types::DateAndTime t3 = t1 + d;
Kernel::TimeInterval dt(t1, t3);
deltaT = dt;
} else {
// 3. n < size
- Kernel::DateAndTime t0;
- Kernel::DateAndTime tf;
+ Mantid::Types::DateAndTime t0;
+ Mantid::Types::DateAndTime tf;
size_t refindex = this->findNthIndexFromQuickRef(n);
if (refindex + 3 >= m_filterQuickRef.size())
@@ -1578,11 +1586,11 @@ TimeInterval TimeSeriesProperty<TYPE>::nthInterval(int n) const {
throw std::logic_error("nthInterval: diff cannot be less than 0.");
// i) start time
- Kernel::DateAndTime ftime0 =
+ Mantid::Types::DateAndTime ftime0 =
m_filter[m_filterQuickRef[refindex].first].first;
size_t iStartIndex =
m_filterQuickRef[refindex + 1].first + static_cast<size_t>(diff);
- Kernel::DateAndTime ltime0 = m_values[iStartIndex].time();
+ Mantid::Types::DateAndTime ltime0 = m_values[iStartIndex].time();
if (iStartIndex == 0 && ftime0 < ltime0) {
// a) Special case that True-filter time starts before log time
t0 = ltime0;
@@ -1599,13 +1607,13 @@ TimeInterval TimeSeriesProperty<TYPE>::nthInterval(int n) const {
size_t iStopIndex = iStartIndex + 1;
if (iStopIndex >= m_values.size()) {
// a) Last log entry is for the start
- Kernel::DateAndTime ftimef =
+ Mantid::Types::DateAndTime ftimef =
m_filter[m_filterQuickRef[refindex + 3].first].first;
tf = ftimef;
} else {
// b) Using the earlier value of next log entry and next filter entry
- Kernel::DateAndTime ltimef = m_values[iStopIndex].time();
- Kernel::DateAndTime ftimef =
+ Mantid::Types::DateAndTime ltimef = m_values[iStopIndex].time();
+ Mantid::Types::DateAndTime ftimef =
m_filter[m_filterQuickRef[refindex + 3].first].first;
if (ltimef < ftimef)
tf = ltimef;
@@ -1661,8 +1669,8 @@ template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::nthValue(int n) const {
value = m_values[ilog].value();
} else {
// 2. n < size
- Kernel::DateAndTime t0;
- Kernel::DateAndTime tf;
+ Mantid::Types::DateAndTime t0;
+ Mantid::Types::DateAndTime tf;
size_t refindex = findNthIndexFromQuickRef(n);
if (refindex + 3 >= m_filterQuickRef.size()) {
@@ -1684,7 +1692,7 @@ template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::nthValue(int n) const {
* @return DateAndTime
*/
template <typename TYPE>
-Kernel::DateAndTime TimeSeriesProperty<TYPE>::nthTime(int n) const {
+Mantid::Types::DateAndTime TimeSeriesProperty<TYPE>::nthTime(int n) const {
sortIfNecessary();
if (m_values.empty()) {
@@ -1730,7 +1738,7 @@ void TimeSeriesProperty<TYPE>::filterWith(
}
// 2. Construct mFilter
- std::vector<Kernel::DateAndTime> filtertimes = filter->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> filtertimes = filter->timesAsVector();
std::vector<bool> filtervalues = filter->valuesAsVector();
assert(filtertimes.size() == filtervalues.size());
const size_t nFilterTimes(filtertimes.size());
@@ -1889,9 +1897,9 @@ template <typename TYPE> void TimeSeriesProperty<TYPE>::eliminateDuplicates() {
typename std::vector<TimeValueUnit<TYPE>>::iterator vit;
vit = m_values.begin() + 1;
- Kernel::DateAndTime prevtime = m_values.begin()->time();
+ Mantid::Types::DateAndTime prevtime = m_values.begin()->time();
while (vit != m_values.end()) {
- Kernel::DateAndTime currtime = vit->time();
+ Mantid::Types::DateAndTime currtime = vit->time();
if (prevtime == currtime) {
// Print out warning
g_log.debug() << "Entry @ Time = " << prevtime
@@ -1964,7 +1972,7 @@ void TimeSeriesProperty<TYPE>::sortIfNecessary() const {
* if t is later (larger) than the ending time, return m_value.size
*/
template <typename TYPE>
-int TimeSeriesProperty<TYPE>::findIndex(Kernel::DateAndTime t) const {
+int TimeSeriesProperty<TYPE>::findIndex(Mantid::Types::DateAndTime t) const {
// 0. Return with an empty container
if (m_values.empty())
return 0;
@@ -1998,8 +2006,8 @@ int TimeSeriesProperty<TYPE>::findIndex(Kernel::DateAndTime t) const {
* mP.size(): exceeding upper bound
*/
template <typename TYPE>
-int TimeSeriesProperty<TYPE>::upperBound(Kernel::DateAndTime t, int istart,
- int iend) const {
+int TimeSeriesProperty<TYPE>::upperBound(Mantid::Types::DateAndTime t,
+ int istart, int iend) const {
// 0. Check validity
if (istart < 0) {
throw std::invalid_argument("Start Index cannot be less than 0");
@@ -2292,19 +2300,19 @@ void TimeSeriesProperty<TYPE>::saveProperty(::NeXus::File *file) {
file->closeGroup();
}
/** Calculate constant step histogram of the time series data.
-* @param tMin -- minimal time to include in histogram
-* @param tMax -- maximal time to constrain the histogram data
-* @param counts -- vector of output histogrammed data.
-* On input, the size of the vector defines the number of points in the
-* histogram.
-* On output, adds all property elements belonging to the time interval
-* [tMin+n*dT;tMin+(n+1)*dT]
-* to the initial values of each n-th element of the counts vector,
-* where dT = (tMax-tMin)/counts.size() */
+ * @param tMin -- minimal time to include in histogram
+ * @param tMax -- maximal time to constrain the histogram data
+ * @param counts -- vector of output histogrammed data.
+ * On input, the size of the vector defines the number of points in the
+ * histogram.
+ * On output, adds all property elements belonging to the time interval
+ * [tMin+n*dT;tMin+(n+1)*dT]
+ * to the initial values of each n-th element of the counts vector,
+ * where dT = (tMax-tMin)/counts.size() */
template <typename TYPE>
void TimeSeriesProperty<TYPE>::histogramData(
- const Kernel::DateAndTime &tMin, const Kernel::DateAndTime &tMax,
- std::vector<double> &counts) const {
+ const Mantid::Types::DateAndTime &tMin,
+ const Mantid::Types::DateAndTime &tMax, std::vector<double> &counts) const {
size_t nPoints = counts.size();
if (nPoints == 0)
@@ -2329,8 +2337,8 @@ void TimeSeriesProperty<TYPE>::histogramData(
template <>
void TimeSeriesProperty<std::string>::histogramData(
- const Kernel::DateAndTime &tMin, const Kernel::DateAndTime &tMax,
- std::vector<double> &counts) const {
+ const Mantid::Types::DateAndTime &tMin,
+ const Mantid::Types::DateAndTime &tMax, std::vector<double> &counts) const {
UNUSED_ARG(tMin);
UNUSED_ARG(tMax);
UNUSED_ARG(counts);
@@ -2377,7 +2385,7 @@ std::vector<TYPE> TimeSeriesProperty<TYPE>::filteredValuesAsVector() const {
*/
template <typename TYPE>
bool TimeSeriesProperty<TYPE>::isTimeFiltered(
- const Kernel::DateAndTime &time) const {
+ const Mantid::Types::DateAndTime &time) const {
if (m_filter.empty()) {
return false; // no filter
}
@@ -2389,8 +2397,10 @@ bool TimeSeriesProperty<TYPE>::isTimeFiltered(
// Find which range it lives in
auto filterEntry = std::lower_bound(
m_filter.begin(), m_filter.end(), time,
- [](const std::pair<Kernel::DateAndTime, bool> &filterEntry,
- const Kernel::DateAndTime &t) { return filterEntry.first < t; });
+ [](const std::pair<Mantid::Types::DateAndTime, bool> &filterEntry,
+ const Mantid::Types::DateAndTime &t) {
+ return filterEntry.first < t;
+ });
if (filterEntry != m_filter.begin()) {
--filterEntry; // get the latest time BEFORE the given time
@@ -2514,5 +2524,5 @@ filterByStatistic(TimeSeriesProperty<double> const *const propertyToFilter,
};
return singleValue;
}
-}
-}
+} // namespace Kernel
+} // namespace Mantid
diff --git a/Framework/Kernel/src/TimeSplitter.cpp b/Framework/Kernel/src/TimeSplitter.cpp
index f4bcd032e6d64940e0595d95ecfaa7a969d34957..d6f002c33de91a2d2007ad9905dd84e434787324 100644
--- a/Framework/Kernel/src/TimeSplitter.cpp
+++ b/Framework/Kernel/src/TimeSplitter.cpp
@@ -1,5 +1,7 @@
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/TimeSplitter.h"
+#include "MantidTypes/DateAndTime.h"
+
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace Kernel {
@@ -267,5 +269,5 @@ TimeSplitterType operator~(const TimeSplitterType &a) {
}
return out;
}
-}
-}
+} // namespace Kernel
+} // namespace Mantid
diff --git a/Framework/Kernel/src/UsageService.cpp b/Framework/Kernel/src/UsageService.cpp
index 54ab2d4a49e74e64a2919b2cc2e6fd49f236f7e6..17ba9a5a5da92fcff4c2dd754ae1c1b6cb068ec5 100644
--- a/Framework/Kernel/src/UsageService.cpp
+++ b/Framework/Kernel/src/UsageService.cpp
@@ -1,12 +1,12 @@
#include "MantidKernel/UsageService.h"
#include "MantidKernel/ChecksumHelper.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/InternetHelper.h"
-#include "MantidKernel/MantidVersion.h"
#include "MantidKernel/Logger.h"
+#include "MantidKernel/MantidVersion.h"
#include "MantidKernel/ParaViewVersion.h"
+#include "MantidTypes/DateAndTime.h"
#include <Poco/ActiveResult.h>
@@ -28,7 +28,7 @@ const std::string FEATURE_URL("http://reports.mantidproject.org/api/feature");
//----------------------------------------------------------------------------------------------
/** FeatureUsage
-*/
+ */
FeatureUsage::FeatureUsage(const std::string &type, const std::string &name,
const bool internal)
: type(type), name(name), internal(internal) {}
@@ -96,7 +96,7 @@ void UsageServiceImpl::registerStartup() {
}
/** registerFeatureUsage
-*/
+ */
void UsageServiceImpl::registerFeatureUsage(const std::string &type,
const std::string &name,
const bool internal) {
@@ -185,8 +185,8 @@ void UsageServiceImpl::timerCallback(Poco::Timer &) {
}
/**
-* This puts together the system information for the json document.
-*/
+ * This puts together the system information for the json document.
+ */
::Json::Value UsageServiceImpl::generateFeatureHeader() {
::Json::Value header;
@@ -197,8 +197,8 @@ void UsageServiceImpl::timerCallback(Poco::Timer &) {
}
/**
-* This puts together the system information for the json document.
-*/
+ * This puts together the system information for the json document.
+ */
std::string UsageServiceImpl::generateStartupMessage() {
::Json::Value message;
@@ -227,7 +227,8 @@ std::string UsageServiceImpl::generateStartupMessage() {
message["mantidSha1"] = MantidVersion::revisionFull();
// mantid version and sha1
- message["dateTime"] = DateAndTime::getCurrentTime().toISO8601String();
+ message["dateTime"] =
+ Mantid::Types::DateAndTime::getCurrentTime().toISO8601String();
message["application"] = m_application;
@@ -273,17 +274,17 @@ std::string UsageServiceImpl::generateFeatureUsageMessage() {
//--------------------------------------------------------------------------------------------
/**
-* Asynchronous execution
-*/
+ * Asynchronous execution
+ */
/**Async method for sending startup messages
-*/
+ */
int UsageServiceImpl::sendStartupAsyncImpl(const std::string &message) {
return this->sendReport(message, STARTUP_URL);
}
/**Async method for sending feature messages
-*/
+ */
int UsageServiceImpl::sendFeatureAsyncImpl(const std::string &message) {
return this->sendReport(message, FEATURE_URL);
}
@@ -300,7 +301,8 @@ int UsageServiceImpl::sendReport(const std::string &message,
} catch (Mantid::Kernel::Exception::InternetError &e) {
status = e.errorCode();
g_log.information() << "Call to \"" << url << "\" responded with " << status
- << "\n" << e.what() << "\n";
+ << "\n"
+ << e.what() << "\n";
}
return status;
diff --git a/Framework/Kernel/test/CMakeLists.txt b/Framework/Kernel/test/CMakeLists.txt
index 567e5b5ba93d1bda271a8cc8a41fed47b0f1ef31..35786b3b63c49598755ec9da4efd3a101a608ed3 100644
--- a/Framework/Kernel/test/CMakeLists.txt
+++ b/Framework/Kernel/test/CMakeLists.txt
@@ -10,6 +10,7 @@ if ( CXXTEST_FOUND )
cxxtest_add_test ( KernelTest ${TEST_FILES} )
target_link_libraries( KernelTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
+ Types
Kernel
${NEXUS_LIBRARIES}
${Boost_LIBRARIES}
diff --git a/Framework/Kernel/test/FilteredTimeSeriesPropertyTest.h b/Framework/Kernel/test/FilteredTimeSeriesPropertyTest.h
index 07ce5cb300293b8a148f04e3685fbdc035fcd1b9..f41dd4befea2b330129471e4ff3c8edc116f69fb 100644
--- a/Framework/Kernel/test/FilteredTimeSeriesPropertyTest.h
+++ b/Framework/Kernel/test/FilteredTimeSeriesPropertyTest.h
@@ -3,6 +3,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidKernel/FilteredTimeSeriesProperty.h"
+#include "MantidKernel/TimeInterval.h"
using Mantid::Kernel::FilteredTimeSeriesProperty;
diff --git a/Framework/Kernel/test/LogFilterTest.h b/Framework/Kernel/test/LogFilterTest.h
index eaa80e67fb029b622b9890ce8edbc3ecc448294f..91c75a915be9480bba6c00f41a552b8fc5c4c23f 100644
--- a/Framework/Kernel/test/LogFilterTest.h
+++ b/Framework/Kernel/test/LogFilterTest.h
@@ -5,6 +5,7 @@
#include "MantidKernel/LogFilter.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/TimeInterval.h"
#include <ctime>
using namespace Mantid::Kernel;
diff --git a/Framework/Kernel/test/LogParserTest.h b/Framework/Kernel/test/LogParserTest.h
index 81249f6310179910c36cb207b8b8d0befe63d6e0..0cd7f7607c7dd1e427974edd71d8cdfd8f03d90e 100644
--- a/Framework/Kernel/test/LogParserTest.h
+++ b/Framework/Kernel/test/LogParserTest.h
@@ -6,16 +6,18 @@
#include <fstream>
#include <numeric>
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/LogParser.h"
-#include "MantidKernel/make_unique.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/make_unique.h"
#include <boost/lexical_cast.hpp>
#include <boost/scoped_ptr.hpp>
#include <Poco/File.h>
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class LogParserTest : public CxxTest::TestSuite {
public:
@@ -241,14 +243,18 @@ public:
// Check the size
TS_ASSERT_EQUALS(4, timeseriesprop->size());
// Check the exact time stamps
- TS_ASSERT_EQUALS(DateAndTime("2000-09-05T12:22:55"),
- timeseriesprop->nthTime(0));
- TS_ASSERT_EQUALS(DateAndTime("2000-09-05T12:23:08"),
- timeseriesprop->nthTime(1));
- TS_ASSERT_EQUALS(DateAndTime("2000-09-05T12:23:22"),
- timeseriesprop->nthTime(2));
- TS_ASSERT_EQUALS(DateAndTime("2000-09-05T12:23:37"),
- timeseriesprop->nthTime(3));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2000-09-05T12:22:55"),
+ timeseriesprop->nthTime(0));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2000-09-05T12:23:08"),
+ timeseriesprop->nthTime(1));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2000-09-05T12:23:22"),
+ timeseriesprop->nthTime(2));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2000-09-05T12:23:37"),
+ timeseriesprop->nthTime(3));
}
void testConstructionFromPropertyUsingICPVariant_CHANGE_PERIOD() {
@@ -273,14 +279,18 @@ public:
// Check the size
TS_ASSERT_EQUALS(4, timeseriesprop->size());
// Check the exact time stamps
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:15:00"),
- timeseriesprop->nthTime(0));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:16:00"),
- timeseriesprop->nthTime(1));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:17:00"),
- timeseriesprop->nthTime(2));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:18:00"),
- timeseriesprop->nthTime(3));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00"),
+ timeseriesprop->nthTime(0));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00"),
+ timeseriesprop->nthTime(1));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ timeseriesprop->nthTime(2));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"),
+ timeseriesprop->nthTime(3));
}
void testConstructionFromPropertyUsingICPVariant_CHANGE_SPACE_PERIOD() {
@@ -305,14 +315,18 @@ public:
// Check the size
TS_ASSERT_EQUALS(4, timeseriesprop->size());
// Check the exact time stamps
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:15:00"),
- timeseriesprop->nthTime(0));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:16:00"),
- timeseriesprop->nthTime(1));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:17:00"),
- timeseriesprop->nthTime(2));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:18:00"),
- timeseriesprop->nthTime(3));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00"),
+ timeseriesprop->nthTime(0));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00"),
+ timeseriesprop->nthTime(1));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ timeseriesprop->nthTime(2));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"),
+ timeseriesprop->nthTime(3));
}
// Check that periods that don't have a full "CHANGE PERIOD" flag are not
@@ -340,12 +354,15 @@ public:
// Check the size
TS_ASSERT_EQUALS(3, timeseriesprop->size());
// Check the exact time stamps
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:15:00"),
- timeseriesprop->nthTime(0));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:16:00"),
- timeseriesprop->nthTime(1));
- TS_ASSERT_EQUALS(DateAndTime("2007-11-30T16:17:00"),
- timeseriesprop->nthTime(2));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00"),
+ timeseriesprop->nthTime(0));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00"),
+ timeseriesprop->nthTime(1));
+ TS_ASSERT_EQUALS(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ timeseriesprop->nthTime(2));
}
void testCreatesCurrentPeriodLog() {
@@ -397,7 +414,8 @@ public:
auto log = make_unique<TimeSeriesProperty<double>>("MydoubleLog");
std::vector<double> values(logSize);
std::iota(values.begin(), values.end(), 1);
- DateAndTime firstTime("2007-11-30T16:17:00");
+ DateAndTime firstTime =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<DateAndTime> times(logSize);
std::generate(times.begin(), times.end(),
[&firstTime] { return firstTime += 10.0; });
@@ -498,14 +516,10 @@ public:
{"2013-10-16T19:13:09", 1}};
const std::vector<std::pair<std::string, bool>> checkRunning{
- {"2013-10-16T19:04:48", true},
- {"2013-10-16T19:06:53", false},
- {"2013-10-16T19:06:53", true},
- {"2013-10-16T19:08:58", false},
- {"2013-10-16T19:08:59", true},
- {"2013-10-16T19:11:03", false},
- {"2013-10-16T19:11:04", true},
- {"2013-10-16T19:13:09", false}};
+ {"2013-10-16T19:04:48", true}, {"2013-10-16T19:06:53", false},
+ {"2013-10-16T19:06:53", true}, {"2013-10-16T19:08:58", false},
+ {"2013-10-16T19:08:59", true}, {"2013-10-16T19:11:03", false},
+ {"2013-10-16T19:11:04", true}, {"2013-10-16T19:13:09", false}};
const LogParser logparser(log.get());
@@ -622,18 +636,25 @@ public:
auto log = make_unique<TimeSeriesProperty<std::string>>("MyICPevent");
// (This is a cut-down version of EMU66122)
- const DateAndTime timeZero{"2016-10-01T10:01:44"};
+ const DateAndTime timeZero =
+ DateAndTimeHelpers::createFromISO8601("2016-10-01T10:01:44");
const std::vector<DateAndTime> times{
timeZero, timeZero + 3.0, timeZero + 3.0, timeZero + 3.0,
timeZero + 51.0, timeZero + 51.0, timeZero + 57.0, timeZero + 60.0,
timeZero + 60.0, timeZero + 60.0, timeZero + 111.0, timeZero + 111.0};
const std::vector<std::string> values{
- "CHANGE_PERIOD 1", "CHANGE_PERIOD 1",
- "START_COLLECTION PERIOD 1 GF 0 RF 0 GUAH 0.000000", "BEGIN",
+ "CHANGE_PERIOD 1",
+ "CHANGE_PERIOD 1",
+ "START_COLLECTION PERIOD 1 GF 0 RF 0 GUAH 0.000000",
+ "BEGIN",
"STOP_COLLECTION PERIOD 1 GF 1931 RF 1933 GUAH 0.000000 DUR 48",
- "ABORT", "CHANGE_PERIOD 1", "CHANGE_PERIOD 1",
- "START_COLLECTION PERIOD 1 GF 0 RF 0 GUAH 0.000000", "BEGIN",
- "STOP_COLLECTION PERIOD 1 GF 2062 RF 2064 GUAH 0.000000 DUR 51", "END"};
+ "ABORT",
+ "CHANGE_PERIOD 1",
+ "CHANGE_PERIOD 1",
+ "START_COLLECTION PERIOD 1 GF 0 RF 0 GUAH 0.000000",
+ "BEGIN",
+ "STOP_COLLECTION PERIOD 1 GF 2062 RF 2064 GUAH 0.000000 DUR 51",
+ "END"};
log->addValues(times, values);
const std::multimap<DateAndTime, bool> expectedRunning{
@@ -660,7 +681,8 @@ public:
auto log = make_unique<TimeSeriesProperty<std::string>>("MyICPevent");
// (This is a cut-down version of EMU66122, changed to "old style" commands)
- const DateAndTime timeZero{"2016-10-01T10:01:44"};
+ const DateAndTime timeZero =
+ DateAndTimeHelpers::createFromISO8601("2016-10-01T10:01:44");
const std::vector<DateAndTime> times{
timeZero, timeZero + 3.0, timeZero + 3.0, timeZero + 51.0,
timeZero + 57.0, timeZero + 60.0, timeZero + 60.0, timeZero + 111.0};
diff --git a/Framework/Kernel/test/PropertyNexusTest.h b/Framework/Kernel/test/PropertyNexusTest.h
index 568d78577b16f2fe197f42e00ef1e48cc72853b5..3d94303ba1ff84d590e96ec7b3f3b5e49dd6efca 100644
--- a/Framework/Kernel/test/PropertyNexusTest.h
+++ b/Framework/Kernel/test/PropertyNexusTest.h
@@ -1,18 +1,20 @@
#ifndef MANTID_API_PROPERTYNEXUSTEST_H_
#define MANTID_API_PROPERTYNEXUSTEST_H_
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/PropertyNexus.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/System.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/Timer.h"
#include "MantidTestHelpers/NexusTestHelper.h"
+#include "MantidTypes/DateAndTime.h"
#include <cxxtest/TestSuite.h>
using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class PropertyNexusTest : public CxxTest::TestSuite {
public:
@@ -49,20 +51,28 @@ public:
pvd.saveProperty(th.file);
TimeSeriesProperty<int> tspi("int_series");
- tspi.addValue(DateAndTime("2011-01-01T00:00:01"), 1234);
- tspi.addValue(DateAndTime("2011-01-01T00:01:02"), 4567);
+ tspi.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:00:01"),
+ 1234);
+ tspi.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:01:02"),
+ 4567);
TimeSeriesProperty<double> tspd("double_series");
- tspd.addValue(DateAndTime("2011-01-01T00:00:01"), 1234.5);
- tspd.addValue(DateAndTime("2011-01-01T00:01:02"), 4567.8);
+ tspd.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:00:01"),
+ 1234.5);
+ tspd.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:01:02"),
+ 4567.8);
TimeSeriesProperty<bool> tspb("bool_series");
- tspb.addValue(DateAndTime("2011-01-01T00:00:01"), true);
- tspb.addValue(DateAndTime("2011-01-01T00:01:02"), false);
+ tspb.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:00:01"),
+ true);
+ tspb.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:01:02"),
+ false);
TimeSeriesProperty<std::string> tsps("string_series");
- tsps.addValue(DateAndTime("2011-01-01T00:00:01"), "help me i");
- tsps.addValue(DateAndTime("2011-01-01T00:01:02"), "am stuck in a NXS file");
+ tsps.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:00:01"),
+ "help me i");
+ tsps.addValue(DateAndTimeHelpers::createFromISO8601("2011-01-01T00:01:02"),
+ "am stuck in a NXS file");
tspi.saveProperty(th.file);
tspd.saveProperty(th.file);
diff --git a/Framework/Kernel/test/TimeIntervalTest.h b/Framework/Kernel/test/TimeIntervalTest.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a0980e4a8752e78cee91af8a443acb8297837daa 100644
--- a/Framework/Kernel/test/TimeIntervalTest.h
+++ b/Framework/Kernel/test/TimeIntervalTest.h
@@ -0,0 +1,14 @@
+#ifndef TIMESERIESPROPERTYTEST_H_
+#define TIMESERIESPROPERTYTEST_H_
+
+#include "MantidKernel/TimeInterval.h"
+#include <cxxtest/TestSuite.h>
+
+using namespace Mantid::Kernel;
+
+class TimeIntervalTest : public CxxTest::TestSuite {
+public:
+ void testConstructor() { TS_ASSERT_THROWS_NOTHING(TimeInterval()); }
+};
+
+#endif /*TIMESERIESPROPERTYTEST_H_*/
diff --git a/Framework/Kernel/test/TimeSeriesPropertyTest.h b/Framework/Kernel/test/TimeSeriesPropertyTest.h
index 59bac156824d2139fd38011348c9fa8ae5cf938e..d0299411a05013ba820073b71772f21a9e3a03a0 100644
--- a/Framework/Kernel/test/TimeSeriesPropertyTest.h
+++ b/Framework/Kernel/test/TimeSeriesPropertyTest.h
@@ -1,20 +1,23 @@
#ifndef TIMESERIESPROPERTYTEST_H_
#define TIMESERIESPROPERTYTEST_H_
-#include <cxxtest/TestSuite.h>
-#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Exception.h"
-#include "MantidKernel/make_unique.h"
#include "MantidKernel/PropertyWithValue.h"
+#include "MantidKernel/TimeInterval.h"
+#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/TimeSplitter.h"
+#include "MantidKernel/make_unique.h"
+#include <cxxtest/TestSuite.h>
-#include <cmath>
#include <boost/make_shared.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <cmath>
#include <vector>
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class TimeSeriesPropertyTest : public CxxTest::TestSuite {
// Create a small TSP<double>. Callee owns the returned object.
@@ -31,9 +34,10 @@ class TimeSeriesPropertyTest : public CxxTest::TestSuite {
// Create a small TSP<int>. Callee owns the returned object.
TimeSeriesProperty<int> *createIntegerTSP(int numberOfValues) {
TimeSeriesProperty<int> *log = new TimeSeriesProperty<int>("intProp");
- DateAndTime startTime("2007-11-30T16:17:00");
+ auto startTime =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
for (int value = 0; value < numberOfValues; ++value) {
- DateAndTime time = startTime + value * 10.0;
+ auto time = startTime + value * 10.0;
TS_ASSERT_THROWS_NOTHING(log->addValue(time, value + 1));
}
return log;
@@ -168,10 +172,14 @@ public:
TS_ASSERT_DELTA(timeSec[3], 30.0, 1e-6);
std::vector<DateAndTime> time;
time = p->timesAsVector();
- TS_ASSERT_EQUALS(time[0], DateAndTime("2007-11-30T16:17:00"));
- TS_ASSERT_EQUALS(time[1], DateAndTime("2007-11-30T16:17:10"));
- TS_ASSERT_EQUALS(time[2], DateAndTime("2007-11-30T16:17:20"));
- TS_ASSERT_EQUALS(time[3], DateAndTime("2007-11-30T16:17:30"));
+ TS_ASSERT_EQUALS(
+ time[0], DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(
+ time[1], DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"));
+ TS_ASSERT_EQUALS(
+ time[2], DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"));
+ TS_ASSERT_EQUALS(
+ time[3], DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"));
delete p;
}
@@ -179,7 +187,7 @@ public:
void test_replaceValues() {
// Arrange
size_t num = 1000;
- DateAndTime first("2007-11-30T16:17:10");
+ auto first = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
std::vector<DateAndTime> times;
std::vector<double> values;
@@ -206,7 +214,7 @@ public:
void test_addValues() {
size_t num = 1000;
- DateAndTime first("2007-11-30T16:17:10");
+ auto first = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
std::vector<DateAndTime> times;
std::vector<double> values;
@@ -249,11 +257,13 @@ public:
TS_ASSERT_EQUALS(log->size(), 5);
- DateAndTime t0 = log->firstTime();
- DateAndTime tf = log->lastTime();
+ auto t0 = log->firstTime();
+ auto tf = log->lastTime();
- TS_ASSERT_EQUALS(t0, DateAndTime("2007-11-30T16:17:00"));
- TS_ASSERT_EQUALS(tf, DateAndTime("2007-11-30T16:19:10"));
+ TS_ASSERT_EQUALS(
+ t0, DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(
+ tf, DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:10"));
delete log;
delete log2;
@@ -308,8 +318,8 @@ public:
void test_filterByTime() {
TimeSeriesProperty<int> *log = createIntegerTSP(6);
TS_ASSERT_EQUALS(log->realSize(), 6);
- DateAndTime start = DateAndTime("2007-11-30T16:17:10");
- DateAndTime stop = DateAndTime("2007-11-30T16:17:40");
+ auto start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ auto stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
// Since the filter is < stop, the last one is not counted, so there are 3
// taken out.
@@ -327,8 +337,8 @@ public:
TS_ASSERT_EQUALS(log->realSize(), 6);
Mantid::Kernel::SplittingInterval interval0(
- DateAndTime("2007-11-30T16:17:10"), DateAndTime("2007-11-30T16:17:40"),
- 0);
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40"), 0);
Mantid::Kernel::TimeSplitterType splitters;
splitters.push_back(interval0);
@@ -348,12 +358,12 @@ public:
TS_ASSERT_EQUALS(log->realSize(), 10);
Mantid::Kernel::SplittingInterval interval0(
- DateAndTime("2007-11-30T16:17:10"), DateAndTime("2007-11-30T16:17:40"),
- 0);
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40"), 0);
Mantid::Kernel::SplittingInterval interval1(
- DateAndTime("2007-11-30T16:18:05"), DateAndTime("2007-11-30T16:18:25"),
- 0);
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:05"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:25"), 0);
Mantid::Kernel::TimeSplitterType splitters;
splitters.push_back(interval0);
@@ -375,8 +385,8 @@ public:
TimeSeriesProperty<int> *log = createIntegerTSP(1);
TS_ASSERT_EQUALS(log->realSize(), 1);
- DateAndTime start = DateAndTime("2007-11-30T16:17:10");
- DateAndTime stop = DateAndTime("2007-11-30T16:17:40");
+ auto start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ auto stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
log->filterByTime(start, stop);
// Still there!
@@ -392,8 +402,8 @@ public:
TS_ASSERT_THROWS_NOTHING(log->addValue("1990-01-01T00:00:00", 1));
TS_ASSERT_EQUALS(log->realSize(), 1);
- DateAndTime start = DateAndTime("2007-11-30T16:17:10");
- DateAndTime stop = DateAndTime("2007-11-30T16:17:40");
+ auto start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ auto stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
log->filterByTime(start, stop);
// Still there!
@@ -424,15 +434,15 @@ public:
DateAndTime t;
s = splitter[0];
- t = DateAndTime("2007-11-30T16:17:09");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:09");
TS_ASSERT_DELTA(s.start(), t, 1e-3);
- t = DateAndTime("2007-11-30T16:17:11");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:11");
TS_ASSERT_DELTA(s.stop(), t, 1e-3);
s = splitter[1];
- t = DateAndTime("2007-11-30T16:17:29");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:29");
TS_ASSERT_DELTA(s.start(), t, 1e-3);
- t = DateAndTime("2007-11-30T16:17:41");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:41");
TS_ASSERT_DELTA(s.stop(), t, 1e-3);
// Now test with left-aligned log value boundaries
@@ -441,15 +451,15 @@ public:
TS_ASSERT_EQUALS(splitter.size(), 2);
s = splitter[0];
- t = DateAndTime("2007-11-30T16:17:10");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
TS_ASSERT_DELTA(s.start(), t, 1e-3);
- t = DateAndTime("2007-11-30T16:17:20");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
TS_ASSERT_DELTA(s.stop(), t, 1e-3);
s = splitter[1];
- t = DateAndTime("2007-11-30T16:17:30");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
TS_ASSERT_DELTA(s.start(), t, 1e-3);
- t = DateAndTime("2007-11-30T16:17:50");
+ t = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50");
TS_ASSERT_DELTA(s.stop(), t, 1e-3);
// Check throws if min > max
@@ -476,68 +486,84 @@ public:
TS_ASSERT_THROWS_NOTHING(log.addValue("2007-11-30T16:17:50", 2));
// Create a TimeInterval that's wider than this log
- TimeInterval interval(DateAndTime("2007-11-30T16:16:00"),
- DateAndTime("2007-11-30T16:18:50"));
+ TimeInterval interval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"));
TimeSplitterType splitter;
// Test good at both ends
log.makeFilterByValue(splitter, 1.0, 2.2, 1.0, false);
log.expandFilterToRange(splitter, 1.0, 2.2, interval);
TS_ASSERT_EQUALS(splitter.size(), 2);
- TS_ASSERT_DELTA(splitter[0].start(), DateAndTime("2007-11-30T16:16:00"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[0].stop(), DateAndTime("2007-11-30T16:17:20"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[1].start(), DateAndTime("2007-11-30T16:17:50"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[1].stop(), DateAndTime("2007-11-30T16:18:50"),
- 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[1].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[1].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"), 1e-3);
// Test bad at both ends
log.makeFilterByValue(splitter, 2.5, 10.0, 0.0, false);
log.expandFilterToRange(splitter, 2.5, 10.0, interval);
TS_ASSERT_EQUALS(splitter.size(), 1);
- TS_ASSERT_DELTA(splitter[0].start(), DateAndTime("2007-11-30T16:17:20"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[0].stop(), DateAndTime("2007-11-30T16:17:50"),
- 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50"), 1e-3);
// Test good at start, bad at end
log.makeFilterByValue(splitter, -1.0, 1.5, 0.0, false);
log.expandFilterToRange(splitter, -1.0, 1.5, interval);
TS_ASSERT_EQUALS(splitter.size(), 1);
- TS_ASSERT_DELTA(splitter[0].start(), DateAndTime("2007-11-30T16:16:00"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[0].stop(), DateAndTime("2007-11-30T16:17:10"),
- 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"), 1e-3);
// Test good at end, bad at start
log.makeFilterByValue(splitter, 1.99, 2.5, 1.0, false);
log.expandFilterToRange(splitter, 1.99, 2.5, interval);
TS_ASSERT_EQUALS(splitter.size(), 2);
- TS_ASSERT_DELTA(splitter[0].start(), DateAndTime("2007-11-30T16:17:10"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[0].stop(), DateAndTime("2007-11-30T16:17:20"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[1].start(), DateAndTime("2007-11-30T16:17:50"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[1].stop(), DateAndTime("2007-11-30T16:18:50"),
- 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[1].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[1].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"), 1e-3);
// Check throws if min > max
TS_ASSERT_THROWS(log.expandFilterToRange(splitter, 2.0, 1.0, interval),
std::invalid_argument);
// Test good at both ends, but interval narrower than log range
- TimeInterval narrowinterval(DateAndTime("2007-11-30T16:17:15"),
- DateAndTime("2007-11-30T16:17:41"));
+ TimeInterval narrowinterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:41"));
log.makeFilterByValue(splitter, 0.0, 10.0, 0.0, false);
log.expandFilterToRange(splitter, 0.0, 10.0, narrowinterval);
TS_ASSERT_EQUALS(splitter.size(), 1);
- TS_ASSERT_DELTA(splitter[0].start(), DateAndTime("2007-11-30T16:17:00"),
- 1e-3);
- TS_ASSERT_DELTA(splitter[0].stop(), DateAndTime("2007-11-30T16:17:50"),
- 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].start(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"), 1e-3);
+ TS_ASSERT_DELTA(
+ splitter[0].stop(),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50"), 1e-3);
}
void test_expandFilterToRange_throws_for_string_property() {
@@ -554,30 +580,35 @@ public:
// Test a filter that's fully within the range of both properties
TimeSplitterType filter;
- filter.push_back(SplittingInterval(DateAndTime("2007-11-30T16:17:05"),
- DateAndTime("2007-11-30T16:17:29")));
+ filter.push_back(SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:29")));
TS_ASSERT_DELTA(dblLog->averageValueInFilter(filter), 7.308, 0.001);
TS_ASSERT_DELTA(intLog->averageValueInFilter(filter), 2.167, 0.001);
// Test a filter that starts before the log start time
- filter[0] = SplittingInterval(DateAndTime("2007-11-30T16:16:30"),
- DateAndTime("2007-11-30T16:17:13"));
+ filter[0] = SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:30"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:13"));
TS_ASSERT_DELTA(dblLog->averageValueInFilter(filter), 9.820, 0.001);
TS_ASSERT_DELTA(intLog->averageValueInFilter(filter), 1.070, 0.001);
// How about one that's entirely outside the log range (should just take the
// last value)
- filter[0] = SplittingInterval(DateAndTime("2013-01-01T00:00:00"),
- DateAndTime("2013-01-01T01:00:00"));
+ filter[0] = SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2013-01-01T00:00:00"),
+ DateAndTimeHelpers::createFromISO8601("2013-01-01T01:00:00"));
TS_ASSERT_DELTA(dblLog->averageValueInFilter(filter), 10.55, 0.001);
TS_ASSERT_DELTA(intLog->averageValueInFilter(filter), 5.0, 0.001);
// Test a filter with two separate ranges, one of which goes past the end of
// the log
- filter[0] = SplittingInterval(DateAndTime("2007-11-30T16:17:05"),
- DateAndTime("2007-11-30T16:17:15"));
- filter.push_back(SplittingInterval(DateAndTime("2007-11-30T16:17:25"),
- DateAndTime("2007-11-30T16:17:45")));
+ filter[0] = SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15"));
+ filter.push_back(SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:25"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:45")));
TS_ASSERT_DELTA(dblLog->averageValueInFilter(filter), 9.123, 0.001);
TS_ASSERT_DELTA(intLog->averageValueInFilter(filter), 3.167, 0.001);
@@ -585,22 +616,26 @@ public:
// the first)
// It should work fine.
filter[0] = filter[1];
- filter[0] = SplittingInterval(DateAndTime("2007-11-30T16:17:05"),
- DateAndTime("2007-11-30T16:17:15"));
+ filter[0] = SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15"));
TS_ASSERT_DELTA(dblLog->averageValueInFilter(filter), 9.123, 0.001);
TS_ASSERT_DELTA(intLog->averageValueInFilter(filter), 3.167, 0.001);
// What about an overlap between the filters? It's odd, but it's allowed.
- filter[0] = SplittingInterval(DateAndTime("2007-11-30T16:17:05"),
- DateAndTime("2007-11-30T16:17:15"));
- filter[1] = SplittingInterval(DateAndTime("2007-11-30T16:17:10"),
- DateAndTime("2007-11-30T16:17:20"));
+ filter[0] = SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15"));
+ filter[1] = SplittingInterval(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"));
TS_ASSERT_DELTA(dblLog->averageValueInFilter(filter), 8.16, 0.001);
TS_ASSERT_DELTA(intLog->averageValueInFilter(filter), 1.75, 0.001);
// Check the correct behaviour of empty of single value logs.
TS_ASSERT(std::isnan(dProp->averageValueInFilter(filter)));
- iProp->addValue(DateAndTime("2010-11-30T16:17:25"), 99);
+ iProp->addValue(
+ DateAndTimeHelpers::createFromISO8601("2010-11-30T16:17:25"), 99);
TS_ASSERT_EQUALS(iProp->averageValueInFilter(filter), 99.0);
// Clean up
@@ -639,24 +674,24 @@ public:
// Make a splitter
DateAndTime start, stop;
TimeSplitterType splitter;
- start = DateAndTime("2007-11-30T16:17:10");
- stop = DateAndTime("2007-11-30T16:17:40");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
splitter.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:55");
- stop = DateAndTime("2007-11-30T16:17:56");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:55");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:56");
splitter.push_back(SplittingInterval(start, stop, 1));
- start = DateAndTime("2007-11-30T16:17:56");
- stop = DateAndTime("2007-11-30T16:18:01");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:56");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:01");
splitter.push_back(SplittingInterval(start, stop, 2)); // just one entry
- start = DateAndTime("2007-11-30T16:18:09");
- stop = DateAndTime("2007-11-30T16:18:21");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:09");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:21");
splitter.push_back(SplittingInterval(start, stop, 3));
- start = DateAndTime("2007-11-30T16:18:45");
- stop = DateAndTime("2007-11-30T16:22:50");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:45");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:22:50");
splitter.push_back(SplittingInterval(start, stop, 4));
log->splitByTime(splitter, outputs, false);
@@ -694,12 +729,12 @@ public:
// Make a splitter
DateAndTime start, stop;
TimeSplitterType splitter;
- start = DateAndTime("2007-11-30T16:17:10");
- stop = DateAndTime("2007-11-30T16:17:40");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
splitter.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:35");
- stop = DateAndTime("2007-11-30T16:17:59");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:35");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:59");
splitter.push_back(SplittingInterval(start, stop, 0));
log->splitByTime(splitter, outputs, false);
@@ -722,13 +757,20 @@ public:
void test_splitByTimeVector() {
// create the splitters
std::vector<DateAndTime> split_time_vec;
- split_time_vec.push_back(DateAndTime("2007-11-30T16:17:10"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:17:40"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:17:55"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:17:56"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:18:09"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:18:45"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:22:50"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:55"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:56"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:09"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:45"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:22:50"));
std::vector<int> split_target_vec;
split_target_vec.push_back(1);
@@ -739,16 +781,26 @@ public:
split_target_vec.push_back(3);
TimeSeriesProperty<int> log("test log");
- log.addValue(DateAndTime("2007-11-30T16:17:00"), 1);
- log.addValue(DateAndTime("2007-11-30T16:17:30"), 2);
- log.addValue(DateAndTime("2007-11-30T16:18:00"), 3);
- log.addValue(DateAndTime("2007-11-30T16:18:30"), 4);
- log.addValue(DateAndTime("2007-11-30T16:19:00"), 5);
- log.addValue(DateAndTime("2007-11-30T16:19:30"), 6);
- log.addValue(DateAndTime("2007-11-30T16:20:00"), 7);
- log.addValue(DateAndTime("2007-11-30T16:20:30"), 8);
- log.addValue(DateAndTime("2007-11-30T16:21:00"), 9);
- log.addValue(DateAndTime("2007-11-30T16:21:30"), 10);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ 1);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"),
+ 2);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"),
+ 3);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30"),
+ 4);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00"),
+ 5);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:30"),
+ 6);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00"),
+ 7);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:30"),
+ 8);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:00"),
+ 9);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:30"),
+ 10);
std::vector<TimeSeriesProperty<int> *> outputs;
for (int itarget = 0; itarget < 4; ++itarget) {
@@ -798,13 +850,20 @@ public:
void test_splitByTimeVectorEarlySplitter() {
// create the splitters
std::vector<DateAndTime> split_time_vec;
- split_time_vec.push_back(DateAndTime("2007-11-30T16:00:10"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:00:40"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:07:55"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:07:56"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:08:09"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:08:45"));
- split_time_vec.push_back(DateAndTime("2007-11-30T16:12:50"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:00:10"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:00:40"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:07:55"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:07:56"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:08:09"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:08:45"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:12:50"));
std::vector<int> split_target_vec;
split_target_vec.push_back(1);
@@ -815,16 +874,26 @@ public:
split_target_vec.push_back(3);
TimeSeriesProperty<int> log("test log");
- log.addValue(DateAndTime("2007-11-30T16:17:00"), 1);
- log.addValue(DateAndTime("2007-11-30T16:17:30"), 2);
- log.addValue(DateAndTime("2007-11-30T16:18:00"), 3);
- log.addValue(DateAndTime("2007-11-30T16:18:30"), 4);
- log.addValue(DateAndTime("2007-11-30T16:19:00"), 5);
- log.addValue(DateAndTime("2007-11-30T16:19:30"), 6);
- log.addValue(DateAndTime("2007-11-30T16:20:00"), 7);
- log.addValue(DateAndTime("2007-11-30T16:20:30"), 8);
- log.addValue(DateAndTime("2007-11-30T16:21:00"), 9);
- log.addValue(DateAndTime("2007-11-30T16:21:30"), 10);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ 1);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"),
+ 2);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"),
+ 3);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30"),
+ 4);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00"),
+ 5);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:30"),
+ 6);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00"),
+ 7);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:30"),
+ 8);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:00"),
+ 9);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:30"),
+ 10);
// Initialze the 4 splitters
std::vector<TimeSeriesProperty<int> *> outputs;
@@ -851,13 +920,20 @@ public:
void test_splitByTimeVectorLaterSplitter() {
// create the splitters
std::vector<DateAndTime> split_time_vec;
- split_time_vec.push_back(DateAndTime("2007-12-30T16:00:10"));
- split_time_vec.push_back(DateAndTime("2007-12-30T16:00:40"));
- split_time_vec.push_back(DateAndTime("2007-12-30T16:07:55"));
- split_time_vec.push_back(DateAndTime("2007-12-30T16:07:56"));
- split_time_vec.push_back(DateAndTime("2007-12-30T16:08:09"));
- split_time_vec.push_back(DateAndTime("2007-12-30T16:08:45"));
- split_time_vec.push_back(DateAndTime("2007-12-30T16:12:50"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:00:10"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:00:40"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:07:55"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:07:56"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:08:09"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:08:45"));
+ split_time_vec.push_back(
+ DateAndTimeHelpers::createFromISO8601("2007-12-30T16:12:50"));
std::vector<int> split_target_vec;
split_target_vec.push_back(1);
@@ -869,16 +945,26 @@ public:
// create test log
TimeSeriesProperty<int> log("test log");
- log.addValue(DateAndTime("2007-11-30T16:17:00"), 1);
- log.addValue(DateAndTime("2007-11-30T16:17:30"), 2);
- log.addValue(DateAndTime("2007-11-30T16:18:00"), 3);
- log.addValue(DateAndTime("2007-11-30T16:18:30"), 4);
- log.addValue(DateAndTime("2007-11-30T16:19:00"), 5);
- log.addValue(DateAndTime("2007-11-30T16:19:30"), 6);
- log.addValue(DateAndTime("2007-11-30T16:20:00"), 7);
- log.addValue(DateAndTime("2007-11-30T16:20:30"), 8);
- log.addValue(DateAndTime("2007-11-30T16:21:00"), 9);
- log.addValue(DateAndTime("2007-11-30T16:21:30"), 10);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ 1);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"),
+ 2);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"),
+ 3);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30"),
+ 4);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00"),
+ 5);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:30"),
+ 6);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00"),
+ 7);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:30"),
+ 8);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:00"),
+ 9);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:30"),
+ 10);
// Initialze the 4 splitters
std::vector<TimeSeriesProperty<int> *> outputs;
@@ -903,19 +989,30 @@ public:
void test_splitByTimeVectorFastLogSplitter() {
// create test log
TimeSeriesProperty<int> log("test log");
- log.addValue(DateAndTime("2007-11-30T16:17:00"), 1);
- log.addValue(DateAndTime("2007-11-30T16:17:30"), 2);
- log.addValue(DateAndTime("2007-11-30T16:18:00"), 3);
- log.addValue(DateAndTime("2007-11-30T16:18:30"), 4);
- log.addValue(DateAndTime("2007-11-30T16:19:00"), 5);
- log.addValue(DateAndTime("2007-11-30T16:19:30"), 6);
- log.addValue(DateAndTime("2007-11-30T16:20:00"), 7);
- log.addValue(DateAndTime("2007-11-30T16:20:30"), 8);
- log.addValue(DateAndTime("2007-11-30T16:21:00"), 9);
- log.addValue(DateAndTime("2007-11-30T16:21:30"), 10);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ 1);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"),
+ 2);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"),
+ 3);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30"),
+ 4);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00"),
+ 5);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:30"),
+ 6);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00"),
+ 7);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:30"),
+ 8);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:00"),
+ 9);
+ log.addValue(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:21:30"),
+ 10);
// create a high frequency splitter
- DateAndTime split_time("2007-11-30T16:17:00");
+ auto split_time =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
int64_t dt = 100 * 1000;
std::vector<DateAndTime> vec_split_times;
@@ -1067,23 +1164,23 @@ public:
void test_getSingleValue() {
TimeSeriesProperty<double> *p = createDoubleTSP();
- DateAndTime time1("2007-11-30T16:17:23");
+ auto time1 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:23");
double v1 = p->getSingleValue(time1);
TS_ASSERT_DELTA(v1, 5.55, 1e-6);
- DateAndTime time2("2007-11-30T16:17:03");
+ auto time2 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:03");
double v2 = p->getSingleValue(time2);
TS_ASSERT_DELTA(v2, 9.99, 1e-6);
- DateAndTime time3("2007-11-30T16:17:31");
+ auto time3 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:31");
double v3 = p->getSingleValue(time3);
TS_ASSERT_DELTA(v3, 10.55, 1e-6);
- DateAndTime time4("2007-11-30T16:17:00");
+ auto time4 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
double v4 = p->getSingleValue(time4);
TS_ASSERT_DELTA(v4, 9.99, 1e-6);
- DateAndTime time5("2007-11-30T16:16:59");
+ auto time5 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:59");
double v5 = p->getSingleValue(time5);
TS_ASSERT_DELTA(v5, 9.99, 1e-6);
@@ -1093,7 +1190,7 @@ public:
void test_getSingleValue_emptyPropertyThrows() {
const TimeSeriesProperty<int> empty("Empty");
- DateAndTime time("2013-01-30T16:17:23");
+ auto time = DateAndTimeHelpers::createFromISO8601("2013-01-30T16:17:23");
TS_ASSERT_THROWS(empty.getSingleValue(time), std::runtime_error);
int i;
TS_ASSERT_THROWS(empty.getSingleValue(time, i), std::runtime_error);
@@ -1102,11 +1199,11 @@ public:
void test_firstLastTimeValue() {
TimeSeriesProperty<double> *p = createDoubleTSP();
- Mantid::Kernel::DateAndTime t0 = p->firstTime();
- Mantid::Kernel::DateAndTime tf = p->lastTime();
+ auto t0 = p->firstTime();
+ auto tf = p->lastTime();
- Mantid::Kernel::DateAndTime t0c("2007-11-30T16:17:00");
- Mantid::Kernel::DateAndTime tfc("2007-11-30T16:17:30");
+ auto t0c = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ auto tfc = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
double v0 = p->firstValue();
double vf = p->lastValue();
@@ -1170,9 +1267,9 @@ public:
p1->merge(p2);
// 3. Verify
- Mantid::Kernel::DateAndTime t0("2007-11-30T16:17:00");
- Mantid::Kernel::DateAndTime tf("2007-11-30T16:17:35");
- Mantid::Kernel::DateAndTime t1("2007-11-30T16:17:05");
+ auto t0 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ auto tf = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:35");
+ auto t1 = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05");
TS_ASSERT_EQUALS(p1->firstTime(), t0);
TS_ASSERT_EQUALS(p1->lastTime(), tf);
@@ -1262,10 +1359,10 @@ public:
dynamic_cast<TimeSeriesProperty<double> *>(p->clone());
// 3. Check
- std::vector<Mantid::Kernel::DateAndTime> times1 = p->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times1 = p->timesAsVector();
std::vector<double> values1 = p->valuesAsVector();
- std::vector<Mantid::Kernel::DateAndTime> times2 = newp->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times2 = newp->timesAsVector();
std::vector<double> values2 = newp->valuesAsVector();
TS_ASSERT_EQUALS(times1, times2);
@@ -1356,7 +1453,7 @@ public:
TS_ASSERT_EQUALS(p->realSize(), 1);
TS_ASSERT_EQUALS(p->lastValue(), 99);
- DateAndTime t("2007-11-30T15:17:00");
+ auto t = DateAndTimeHelpers::createFromISO8601("2007-11-30T15:17:00");
p->addValue(t, 88);
TS_ASSERT_EQUALS(p->size(), 2);
@@ -1388,11 +1485,15 @@ public:
TS_ASSERT_THROWS_NOTHING(p->addValue("2007-11-30T16:17:30", 4.00));
// 2. Create method 1
- std::vector<Mantid::Kernel::DateAndTime> times;
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:20"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:30"));
+ std::vector<Mantid::Types::DateAndTime> times;
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:20"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:30"));
std::vector<double> values;
values.push_back(1.00);
values.push_back(3.00);
@@ -1405,8 +1506,8 @@ public:
TS_ASSERT_EQUALS(p->size(), p1->size());
if (p->size() == p1->size()) {
- std::vector<Mantid::Kernel::DateAndTime> times0 = p->timesAsVector();
- std::vector<Mantid::Kernel::DateAndTime> times1 = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times0 = p->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times1 = p1->timesAsVector();
for (size_t i = 0; i < static_cast<size_t>(p->size()); i++) {
TS_ASSERT_EQUALS(times0[i], times1[i]);
TS_ASSERT_DELTA(p->getSingleValue(times0[i]),
@@ -1415,7 +1516,7 @@ public:
}
// 3 Create method 2
- Mantid::Kernel::DateAndTime tStart("2007-11-30T16:17:00");
+ auto tStart = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<double> deltaTs;
std::vector<double> valueXs;
@@ -1430,8 +1531,8 @@ public:
TS_ASSERT_EQUALS(p->size(), p2->size());
if (p->size() == p2->size()) {
- std::vector<Mantid::Kernel::DateAndTime> times0 = p->timesAsVector();
- std::vector<Mantid::Kernel::DateAndTime> times1 = p2->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times0 = p->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times1 = p2->timesAsVector();
for (size_t i = 0; i < static_cast<size_t>(p->size()); i++) {
TS_ASSERT_EQUALS(times0[i], times1[i]);
TS_ASSERT_DELTA(p->getSingleValue(times0[i]),
@@ -1493,21 +1594,25 @@ public:
TS_ASSERT_THROWS_NOTHING(p->addValue("2007-11-30T16:17:30", 4.00));
// 2. Get map
- std::map<Mantid::Kernel::DateAndTime, double> tmap = p->valueAsCorrectMap();
+ std::map<Mantid::Types::DateAndTime, double> tmap = p->valueAsCorrectMap();
// 3. Check
- std::vector<Mantid::Kernel::DateAndTime> times;
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:20"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:30"));
+ std::vector<Mantid::Types::DateAndTime> times;
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:20"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:30"));
std::vector<double> values;
values.push_back(1.00);
values.push_back(2.00);
values.push_back(3.00);
values.push_back(4.00);
- std::map<Mantid::Kernel::DateAndTime, double>::iterator tit;
+ std::map<Mantid::Types::DateAndTime, double>::iterator tit;
size_t index = 0;
for (tit = tmap.begin(); tit != tmap.end(); ++tit) {
TS_ASSERT_EQUALS(tit->first, times[index]);
@@ -1532,16 +1637,21 @@ public:
TS_ASSERT_THROWS_NOTHING(p->addValue("2007-11-30T16:17:30", 4.00));
// 2. Get multimap
- std::multimap<Mantid::Kernel::DateAndTime, double> tmap =
+ std::multimap<Mantid::Types::DateAndTime, double> tmap =
p->valueAsMultiMap();
// 3. Check
- std::vector<Mantid::Kernel::DateAndTime> times;
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:20"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:30"));
+ std::vector<Mantid::Types::DateAndTime> times;
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:20"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:30"));
std::vector<double> values;
values.push_back(1.00);
values.push_back(1.99);
@@ -1575,21 +1685,25 @@ public:
TS_ASSERT_THROWS_NOTHING(p->addValue("2007-11-30T16:17:30", 4.00));
// 2. Get map
- std::map<Mantid::Kernel::DateAndTime, double> tmap = p->valueAsMap();
+ std::map<Mantid::Types::DateAndTime, double> tmap = p->valueAsMap();
// 3. Check
- std::vector<Mantid::Kernel::DateAndTime> times;
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:15"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:30"));
+ std::vector<Mantid::Types::DateAndTime> times;
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:15"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:30"));
std::vector<double> values;
values.push_back(1.00);
values.push_back(2.00);
values.push_back(3.00);
values.push_back(4.00);
- std::map<Mantid::Kernel::DateAndTime, double>::iterator tit;
+ std::map<Mantid::Types::DateAndTime, double>::iterator tit;
size_t index = 0;
for (tit = tmap.begin(); tit != tmap.end(); ++tit) {
TS_ASSERT_EQUALS(tit->first, times[index]);
@@ -1618,24 +1732,28 @@ public:
TS_ASSERT_THROWS_NOTHING(p->addValue("2007-11-30T16:17:30", 4.00));
// 2. Get map
- std::map<Mantid::Kernel::DateAndTime, double> tmap = p->valueAsMap();
+ std::map<Mantid::Types::DateAndTime, double> tmap = p->valueAsMap();
// 3. Check
TS_ASSERT_EQUALS(tmap.size(), 4);
if (tmap.size() == 4) {
- std::vector<Mantid::Kernel::DateAndTime> times;
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:20"));
- times.push_back(Mantid::Kernel::DateAndTime("2007-11-30T16:17:30"));
+ std::vector<Mantid::Types::DateAndTime> times;
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:20"));
+ times.push_back(Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:30"));
std::vector<double> values;
values.push_back(1.00);
values.push_back(2.00);
values.push_back(3.00);
values.push_back(4.00);
- std::map<Mantid::Kernel::DateAndTime, double>::iterator tit;
+ std::map<Mantid::Types::DateAndTime, double>::iterator tit;
size_t index = 0;
for (tit = tmap.begin(); tit != tmap.end(); ++tit) {
TS_ASSERT_EQUALS(tit->first, times[index]);
@@ -1667,20 +1785,20 @@ public:
TS_ASSERT_THROWS_NOTHING(p->addValue("2007-11-30T16:17:30", 4.00));
// 3. Test with term
- Mantid::Kernel::DateAndTime t0 = p->nthTime(0);
- Mantid::Kernel::DateAndTime t0c("2007-11-30T16:17:00");
+ auto t0 = p->nthTime(0);
+ auto t0c = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
TS_ASSERT_EQUALS(t0, t0c);
- Mantid::Kernel::DateAndTime t2 = p->nthTime(2);
- Mantid::Kernel::DateAndTime t2c("2007-11-30T16:17:20");
+ auto t2 = p->nthTime(2);
+ auto t2c = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
TS_ASSERT_EQUALS(t2, t2c);
- Mantid::Kernel::DateAndTime t3 = p->nthTime(3);
- Mantid::Kernel::DateAndTime t3c("2007-11-30T16:17:30");
+ auto t3 = p->nthTime(3);
+ auto t3c = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
TS_ASSERT_EQUALS(t3, t3c);
- Mantid::Kernel::DateAndTime t100 = p->nthTime(100);
- Mantid::Kernel::DateAndTime t100c("2007-11-30T16:17:30");
+ auto t100 = p->nthTime(100);
+ auto t100c = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
TS_ASSERT_EQUALS(t100, t100c);
// 4. Double time
@@ -1714,21 +1832,27 @@ public:
// 3. Test
Mantid::Kernel::TimeInterval dt0 = p->nthInterval(0);
TS_ASSERT_EQUALS(dt0.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
TS_ASSERT_EQUALS(dt0.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:05"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:05"));
Mantid::Kernel::TimeInterval dt1 = p->nthInterval(1);
TS_ASSERT_EQUALS(dt1.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:05"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:05"));
TS_ASSERT_EQUALS(dt1.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:15"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:15"));
Mantid::Kernel::TimeInterval dt2 = p->nthInterval(2);
TS_ASSERT_EQUALS(dt2.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:15"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:15"));
TS_ASSERT_EQUALS(dt2.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:35"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:35"));
// -1 Clean
delete p;
@@ -1741,7 +1865,7 @@ public:
*/
void test_filter() {
// 1. Create a base property
- Mantid::Kernel::DateAndTime tStart("2007-11-30T16:17:00");
+ auto tStart = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<double> deltaTs;
std::vector<double> valueXs;
for (int i = 0; i < 20; i++) {
@@ -1752,7 +1876,7 @@ public:
new TimeSeriesProperty<double>("BaseProperty");
p1->create(tStart, deltaTs, valueXs);
- std::vector<Mantid::Kernel::DateAndTime> times = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times = p1->timesAsVector();
std::vector<double> values = p1->valuesAsVector();
// b) Copy size and interval information in order to verify clearFilter()
@@ -1778,15 +1902,19 @@ public:
Mantid::Kernel::TimeInterval dt1 = p1->nthInterval(1);
TS_ASSERT_EQUALS(dt1.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
TS_ASSERT_EQUALS(dt1.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:16"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:16"));
Mantid::Kernel::TimeInterval dt2 = p1->nthInterval(2);
TS_ASSERT_EQUALS(dt2.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:18:40"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:18:40"));
TS_ASSERT_EQUALS(dt2.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:18:50"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:18:50"));
// 4. Clear filter
p1->clearFilter();
@@ -1837,7 +1965,7 @@ public:
*/
void test_filterBoundary1() {
// 1. Create a base property
- Mantid::Kernel::DateAndTime tStart("2007-11-30T16:17:00");
+ auto tStart = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<double> deltaTs;
std::vector<double> valueXs;
for (int i = 0; i < 20; i++) {
@@ -1848,7 +1976,7 @@ public:
new TimeSeriesProperty<double>("BaseProperty");
p1->create(tStart, deltaTs, valueXs);
- std::vector<Mantid::Kernel::DateAndTime> times = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times = p1->timesAsVector();
std::vector<double> values = p1->valuesAsVector();
// 2. Create a filter for T. F. T. F...
@@ -1867,33 +1995,41 @@ public:
// 4. Check interval & Value
Mantid::Kernel::TimeInterval dt0 = p1->nthInterval(0);
TS_ASSERT_EQUALS(dt0.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:00"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:00"));
TS_ASSERT_EQUALS(dt0.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
double v0 = p1->nthValue(0);
TS_ASSERT_DELTA(v0, 1, 0.00000001);
Mantid::Kernel::TimeInterval dt1 = p1->nthInterval(1);
TS_ASSERT_EQUALS(dt1.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
TS_ASSERT_EQUALS(dt1.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:16"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:16"));
double v1 = p1->nthValue(1);
TS_ASSERT_DELTA(v1, 2, 0.00000001);
Mantid::Kernel::TimeInterval dt2 = p1->nthInterval(2);
TS_ASSERT_EQUALS(dt2.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:18:40"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:18:40"));
TS_ASSERT_EQUALS(dt2.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:18:50"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:18:50"));
double v2 = p1->nthValue(2);
TS_ASSERT_DELTA(v2, 11, 0.00000001);
Mantid::Kernel::TimeInterval dt12 = p1->nthInterval(11);
TS_ASSERT_EQUALS(dt12.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:20:10"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:20:10"));
TS_ASSERT_EQUALS(dt12.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T17:19:30"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T17:19:30"));
double v12 = p1->nthValue(11);
TS_ASSERT_DELTA(v12, 20, 1.0E-8);
@@ -1908,12 +2044,12 @@ public:
}
/*
- * Test filterWith() on different boundary conditions
- * Filter_T0 < Log_T0 < LogTf < Filter_Tf, F... T... F... T... F...
- */
+ * Test filterWith() on different boundary conditions
+ * Filter_T0 < Log_T0 < LogTf < Filter_Tf, F... T... F... T... F...
+ */
void test_filterBoundary2() {
// 1. Create a base property
- Mantid::Kernel::DateAndTime tStart("2007-11-30T16:17:00");
+ auto tStart = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<double> deltaTs;
std::vector<double> valueXs;
for (int i = 0; i < 20; i++) {
@@ -1924,7 +2060,7 @@ public:
new TimeSeriesProperty<double>("BaseProperty");
p1->create(tStart, deltaTs, valueXs);
- std::vector<Mantid::Kernel::DateAndTime> times = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times = p1->timesAsVector();
std::vector<double> values = p1->valuesAsVector();
// 2. Create a filter for T. F. T. F...
@@ -1943,9 +2079,11 @@ public:
// 4. Check interval
Mantid::Kernel::TimeInterval dt0 = p1->nthInterval(0);
TS_ASSERT_EQUALS(dt0.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:16"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:16"));
TS_ASSERT_EQUALS(dt0.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:20"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:20"));
double v0 = p1->nthValue(0);
TS_ASSERT_DELTA(v0, 2, 1.0E-8);
@@ -1960,12 +2098,12 @@ public:
}
/*
- * Test filterWith() on different boundary conditions
- * Log_T0 < Filter_T0 < < Filter_Tf LogTf, T... F... T... F...
- */
+ * Test filterWith() on different boundary conditions
+ * Log_T0 < Filter_T0 < < Filter_Tf LogTf, T... F... T... F...
+ */
void test_filterBoundary3() {
// 1. Create a base property
- Mantid::Kernel::DateAndTime tStart("2007-11-30T16:17:00");
+ auto tStart = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<double> deltaTs;
std::vector<double> valueXs;
for (int i = 0; i < 20; i++) {
@@ -1976,7 +2114,7 @@ public:
new TimeSeriesProperty<double>("BaseProperty");
p1->create(tStart, deltaTs, valueXs);
- std::vector<Mantid::Kernel::DateAndTime> times = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times = p1->timesAsVector();
std::vector<double> values = p1->valuesAsVector();
// 2. Create a filter for T. F. T. F...
@@ -1995,17 +2133,21 @@ public:
// 4. Check interval
Mantid::Kernel::TimeInterval dt1 = p1->nthInterval(1);
TS_ASSERT_EQUALS(dt1.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:10"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:10"));
TS_ASSERT_EQUALS(dt1.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:16"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:16"));
double v1 = p1->nthValue(1);
TS_ASSERT_DELTA(v1, 2, 1.0E-8);
Mantid::Kernel::TimeInterval dt2 = p1->nthInterval(2);
TS_ASSERT_EQUALS(dt2.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:18:40"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:18:40"));
TS_ASSERT_EQUALS(dt2.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:18:50"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:18:50"));
double v2 = p1->nthValue(2);
TS_ASSERT_DELTA(v2, 11, 1.0E-8);
@@ -2022,11 +2164,11 @@ public:
/*
* Test filterWith() on different boundary conditions
* Log_T0 < Filter_T0 < < Filter_Tf LogTf, F... T... F... T... F...
- */
+ */
void test_filterBoundary4() {
// 1. Create a base property
- Mantid::Kernel::DateAndTime tStart("2007-11-30T16:17:00");
+ auto tStart = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
std::vector<double> deltaTs;
std::vector<double> valueXs;
for (int i = 0; i < 20; i++) {
@@ -2037,7 +2179,7 @@ public:
new TimeSeriesProperty<double>("BaseProperty");
p1->create(tStart, deltaTs, valueXs);
- std::vector<Mantid::Kernel::DateAndTime> times = p1->timesAsVector();
+ std::vector<Mantid::Types::DateAndTime> times = p1->timesAsVector();
std::vector<double> values = p1->valuesAsVector();
// 2. Create a filter for T. F. T. F...
@@ -2056,9 +2198,11 @@ public:
// 4. Check interval
Mantid::Kernel::TimeInterval dt0 = p1->nthInterval(0);
TS_ASSERT_EQUALS(dt0.begin(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:16"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:16"));
TS_ASSERT_EQUALS(dt0.end(),
- Mantid::Kernel::DateAndTime("2007-11-30T16:17:20"));
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ "2007-11-30T16:17:20"));
double v0 = p1->nthValue(0);
TS_ASSERT_DELTA(v0, 2, 1.0E-8);
@@ -2196,7 +2340,7 @@ public:
//----------------------------------------------------------------------------
/** A test for filter nothing
- */
+ */
void test_filterByTime_out_of_range_filters_nothing() {
TimeSeriesProperty<int> *log = createIntegerTSP(6);
@@ -2204,9 +2348,9 @@ public:
TS_ASSERT_EQUALS(original_size, 6);
- DateAndTime start = DateAndTime(
+ auto start = DateAndTimeHelpers::createFromISO8601(
"2007-11-30T15:00:00"); // Much earlier than first time series value
- DateAndTime stop = DateAndTime(
+ auto stop = DateAndTimeHelpers::createFromISO8601(
"2007-11-30T17:00:00"); // Much later than last time series value
log->filterByTime(start, stop);
@@ -2262,9 +2406,14 @@ public:
// Add the filter
auto filter =
Mantid::Kernel::make_unique<TimeSeriesProperty<bool>>("Filter");
- Mantid::Kernel::DateAndTime firstStart("2007-11-30T16:17:00"),
- firstEnd("2007-11-30T16:17:15"), secondStart("2007-11-30T16:18:35"),
- secondEnd("2007-11-30T16:18:40");
+ Mantid::Types::DateAndTime
+ firstStart =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ firstEnd = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15"),
+ secondStart =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:35"),
+ secondEnd =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:40");
filter->addValue(firstStart.toISO8601String(), true);
filter->addValue(firstEnd.toISO8601String(), false);
filter->addValue("2007-11-30T16:17:25", false);
@@ -2289,9 +2438,14 @@ public:
// Add the filter
auto filter =
Mantid::Kernel::make_unique<TimeSeriesProperty<bool>>("Filter");
- Mantid::Kernel::DateAndTime firstEnd("2007-11-30T16:17:05"),
- secondStart("2007-11-30T16:17:10"), secondEnd("2007-11-30T16:17:15"),
- thirdStart("2007-11-30T16:18:35");
+ Mantid::Types::DateAndTime
+ firstEnd = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05"),
+ secondStart =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"),
+ secondEnd =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15"),
+ thirdStart =
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:35");
filter->addValue(log->firstTime(), true);
filter->addValue(firstEnd.toISO8601String(), false);
filter->addValue(secondStart.toISO8601String(), true);
@@ -2316,7 +2470,7 @@ private:
// Build the log
auto log =
Mantid::Kernel::make_unique<TimeSeriesProperty<double>>("DoubleLog");
- Mantid::Kernel::DateAndTime logTime("2007-11-30T16:17:00");
+ auto logTime = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
const double incrementSecs(10.0);
for (int i = 1; i < 12; ++i) {
const double val = static_cast<double>(i);
diff --git a/Framework/Kernel/test/TimeSplitterTest.h b/Framework/Kernel/test/TimeSplitterTest.h
index 9ee87ea4dedb16b59596a40b1d72657639753df1..e963580926218cecda1c76c49dafe093f656f26f 100644
--- a/Framework/Kernel/test/TimeSplitterTest.h
+++ b/Framework/Kernel/test/TimeSplitterTest.h
@@ -11,9 +11,10 @@
#include <cxxtest/TestSuite.h>
#include <ctime>
#include "MantidKernel/TimeSplitter.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class TimeSplitterTest : public CxxTest::TestSuite {
public:
@@ -24,14 +25,14 @@ public:
void test_SplittingInterval_AND() {
DateAndTime start_a, stop_a, start_b, stop_b;
- start_a = DateAndTime("2007-11-30T16:17:10");
- stop_a = DateAndTime("2007-11-30T16:17:20");
+ start_a = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ stop_a = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
SplittingInterval a(start_a, stop_a, 0);
SplittingInterval b, c;
// b is all inside a
- start_b = DateAndTime("2007-11-30T16:17:12");
- stop_b = DateAndTime("2007-11-30T16:17:18");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:12");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:18");
b = SplittingInterval(start_b, stop_b, 0);
c = a & b;
TS_ASSERT(a.overlaps(b));
@@ -39,8 +40,8 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_b);
// a is all inside b
- start_b = DateAndTime("2007-11-30T16:17:05");
- stop_b = DateAndTime("2007-11-30T16:17:23");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:23");
b = SplittingInterval(start_b, stop_b, 0);
c = a & b;
TS_ASSERT(a.overlaps(b));
@@ -48,8 +49,8 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_a);
// b goes past the end of a
- start_b = DateAndTime("2007-11-30T16:17:12");
- stop_b = DateAndTime("2007-11-30T16:17:25");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:12");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:25");
b = SplittingInterval(start_b, stop_b, 0);
c = a & b;
TS_ASSERT(a.overlaps(b));
@@ -57,8 +58,8 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_a);
// b starts before a and ends before
- start_b = DateAndTime("2007-11-30T16:17:05");
- stop_b = DateAndTime("2007-11-30T16:17:15");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15");
b = SplittingInterval(start_b, stop_b, 0);
c = a & b;
TS_ASSERT(a.overlaps(b));
@@ -66,16 +67,16 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_b);
// No overlap (b < a)
- start_b = DateAndTime("2007-11-30T16:17:01");
- stop_b = DateAndTime("2007-11-30T16:17:02");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:01");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:02");
b = SplittingInterval(start_b, stop_b, 0);
c = a & b;
TS_ASSERT(!a.overlaps(b));
TS_ASSERT_LESS_THAN_EQUALS(c.duration(), 0.0);
// No overlap (a < b)
- start_b = DateAndTime("2007-11-30T16:17:30");
- stop_b = DateAndTime("2007-11-30T16:17:42");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:42");
b = SplittingInterval(start_b, stop_b, 0);
c = a & b;
TS_ASSERT(!a.overlaps(b));
@@ -89,14 +90,14 @@ public:
void test_SplittingInterval_OR() {
DateAndTime start_a, stop_a, start_b, stop_b;
- start_a = DateAndTime("2007-11-30T16:17:10");
- stop_a = DateAndTime("2007-11-30T16:17:20");
+ start_a = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ stop_a = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
SplittingInterval a(start_a, stop_a, 0);
SplittingInterval b, c;
// b is all inside a
- start_b = DateAndTime("2007-11-30T16:17:12");
- stop_b = DateAndTime("2007-11-30T16:17:18");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:12");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:18");
b = SplittingInterval(start_b, stop_b, 0);
c = a | b;
TS_ASSERT(a.overlaps(b));
@@ -104,8 +105,8 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_a);
// a is all inside b
- start_b = DateAndTime("2007-11-30T16:17:05");
- stop_b = DateAndTime("2007-11-30T16:17:23");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:23");
b = SplittingInterval(start_b, stop_b, 0);
c = a | b;
TS_ASSERT(a.overlaps(b));
@@ -113,8 +114,8 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_b);
// b goes past the end of a
- start_b = DateAndTime("2007-11-30T16:17:12");
- stop_b = DateAndTime("2007-11-30T16:17:25");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:12");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:25");
b = SplittingInterval(start_b, stop_b, 0);
c = a | b;
TS_ASSERT(a.overlaps(b));
@@ -122,8 +123,8 @@ public:
TS_ASSERT_EQUALS(c.stop(), stop_b);
// b starts before a and ends before
- start_b = DateAndTime("2007-11-30T16:17:05");
- stop_b = DateAndTime("2007-11-30T16:17:15");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:05");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15");
b = SplittingInterval(start_b, stop_b, 0);
c = a | b;
TS_ASSERT(a.overlaps(b));
@@ -132,15 +133,15 @@ public:
// No overlap (b < a) - This throws an exception because you need two
// outputs!
- start_b = DateAndTime("2007-11-30T16:17:01");
- stop_b = DateAndTime("2007-11-30T16:17:02");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:01");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:02");
b = SplittingInterval(start_b, stop_b, 0);
TS_ASSERT(!a.overlaps(b));
TS_ASSERT_THROWS(c = a | b;, std::invalid_argument);
// No overlap (a < b)
- start_b = DateAndTime("2007-11-30T16:17:30");
- stop_b = DateAndTime("2007-11-30T16:17:42");
+ start_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
+ stop_b = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:42");
b = SplittingInterval(start_b, stop_b, 0);
TS_ASSERT(!a.overlaps(b));
TS_ASSERT_THROWS(c = a | b;, std::invalid_argument);
@@ -151,37 +152,37 @@ public:
// Make a splitter
DateAndTime start, stop;
TimeSplitterType a, b;
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:17:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:20");
- stop = DateAndTime("2007-11-30T16:17:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:40");
- stop = DateAndTime("2007-11-30T16:17:50");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:18:00");
- stop = DateAndTime("2007-11-30T16:18:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:18:20");
- stop = DateAndTime("2007-11-30T16:18:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30");
a.push_back(SplittingInterval(start, stop, 0));
// Smaller than the first one
- start = DateAndTime("2007-11-30T16:17:01");
- stop = DateAndTime("2007-11-30T16:17:25");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:01");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:25");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:26");
- stop = DateAndTime("2007-11-30T16:17:27");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:26");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:27");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:45");
- stop = DateAndTime("2007-11-30T16:18:15");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:45");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:15");
b.push_back(SplittingInterval(start, stop, 0));
// Now AND the splitters (filters) together
@@ -194,20 +195,20 @@ public:
SplittingInterval i;
i = c[0];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:01"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:10"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:01"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"));
i = c[1];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:20"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:25"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:25"));
i = c[2];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:26"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:27"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:26"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:27"));
i = c[3];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:45"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:50"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:45"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50"));
i = c[4];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:18:00"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:10"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:10"));
}
//----------------------------------------------------------------------------
@@ -215,41 +216,41 @@ public:
// Make a splitter
DateAndTime start, stop;
TimeSplitterType a, b;
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:17:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:20");
- stop = DateAndTime("2007-11-30T16:17:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:40");
- stop = DateAndTime("2007-11-30T16:17:50");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:50");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:18:00");
- stop = DateAndTime("2007-11-30T16:18:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:18:20");
- stop = DateAndTime("2007-11-30T16:18:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30");
a.push_back(SplittingInterval(start, stop, 0));
// Smaller than the first one
- start = DateAndTime("2007-11-30T16:17:01");
- stop = DateAndTime("2007-11-30T16:17:25");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:01");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:25");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:26");
- stop = DateAndTime("2007-11-30T16:17:27");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:26");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:27");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:45");
- stop = DateAndTime("2007-11-30T16:18:15");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:45");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:15");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:18:50");
- stop = DateAndTime("2007-11-30T16:18:55");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:55");
b.push_back(SplittingInterval(start, stop, 0));
// Now AND the splitters (filters) together
@@ -262,17 +263,17 @@ public:
SplittingInterval i;
i = c[0];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:00"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:30"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"));
i = c[1];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:40"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:15"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:15"));
i = c[2];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:18:20"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:30"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:20"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:30"));
i = c[3];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:18:50"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:55"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:55"));
}
//----------------------------------------------------------------------------
@@ -281,23 +282,23 @@ public:
DateAndTime start, stop;
TimeSplitterType a, b;
- start = DateAndTime("2007-11-30T16:17:20");
- stop = DateAndTime("2007-11-30T16:17:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
a.push_back(SplittingInterval(start, stop, 0));
// A bad (reversed) interval
- start = DateAndTime("2007-11-30T16:17:32");
- stop = DateAndTime("2007-11-30T16:17:31");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:32");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:31");
a.push_back(SplittingInterval(start, stop, 0));
// REVERSED interval that is before the first one
- start = DateAndTime("2007-11-30T16:17:15");
- stop = DateAndTime("2007-11-30T16:17:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
b.push_back(SplittingInterval(start, stop, 0));
// Another bad interval
- start = DateAndTime("2007-11-30T16:17:45");
- stop = DateAndTime("2007-11-30T16:17:35");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:45");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:35");
b.push_back(SplittingInterval(start, stop, 0));
// Now AND the splitters (filters) together
@@ -310,8 +311,8 @@ public:
SplittingInterval i;
i = c[0];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:20"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:30"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"));
}
//----------------------------------------------------------------------------
@@ -321,12 +322,12 @@ public:
SplittingInterval i;
//---- Normal Case ------
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:17:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:20");
- stop = DateAndTime("2007-11-30T16:17:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
a.push_back(SplittingInterval(start, stop, 0));
// Perform the NOT operation
@@ -338,12 +339,12 @@ public:
i = c[0];
TS_ASSERT_EQUALS(i.start(), DateAndTime::minimum());
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
i = c[1];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:10"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:20"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"));
i = c[2];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:30"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"));
TS_ASSERT_EQUALS(i.stop(), DateAndTime::maximum());
}
@@ -369,12 +370,12 @@ public:
TimeSplitterType a, b, c;
SplittingInterval i;
// Overlapping case ------
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:17:15");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:15");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:10");
- stop = DateAndTime("2007-11-30T16:17:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
a.push_back(SplittingInterval(start, stop, 0));
c = ~a;
@@ -384,9 +385,9 @@ public:
i = c[0];
TS_ASSERT_EQUALS(i.start(), DateAndTime::minimum());
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
i = c[1];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:30"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"));
TS_ASSERT_EQUALS(i.stop(), DateAndTime::maximum());
}
@@ -397,41 +398,41 @@ public:
SplittingInterval i;
// the splitter ------
- start = DateAndTime("2007-11-30T16:15:00");
- stop = DateAndTime("2007-11-30T16:16:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:18:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
b.push_back(SplittingInterval(start, stop, 1));
- start = DateAndTime("2007-11-30T16:18:00");
- stop = DateAndTime("2007-11-30T16:19:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00");
b.push_back(SplittingInterval(start, stop, 2));
- start = DateAndTime("2007-11-30T16:19:00");
- stop = DateAndTime("2007-11-30T16:20:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00");
b.push_back(SplittingInterval(start, stop, 3));
// the filter ------
- start = DateAndTime("2007-11-30T16:16:50");
- stop = DateAndTime("2007-11-30T16:17:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:50");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:20");
- stop = DateAndTime("2007-11-30T16:17:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:17:40");
- stop = DateAndTime("2007-11-30T16:18:10");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:10");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:18:50");
- stop = DateAndTime("2007-11-30T16:18:55");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:55");
a.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:22:20");
- stop = DateAndTime("2007-11-30T16:22:30");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:22:20");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:22:30");
a.push_back(SplittingInterval(start, stop, 0));
// Do the PLUS operation
@@ -442,28 +443,28 @@ public:
return; // avoid segfaults if this part of the test fails
i = c[0];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:00"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:10"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"));
TS_ASSERT_EQUALS(i.index(), 1);
i = c[1];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:20"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:17:30"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:20"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:30"));
TS_ASSERT_EQUALS(i.index(), 1);
i = c[2];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:17:40"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:00"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:40"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"));
TS_ASSERT_EQUALS(i.index(), 1);
i = c[3];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:18:00"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:10"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:10"));
TS_ASSERT_EQUALS(i.index(), 2);
i = c[4];
- TS_ASSERT_EQUALS(i.start(), DateAndTime("2007-11-30T16:18:50"));
- TS_ASSERT_EQUALS(i.stop(), DateAndTime("2007-11-30T16:18:55"));
+ TS_ASSERT_EQUALS(i.start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:50"));
+ TS_ASSERT_EQUALS(i.stop(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:55"));
TS_ASSERT_EQUALS(i.index(), 2);
// This fails since you can't add splitters together
@@ -476,28 +477,28 @@ public:
TimeSplitterType b;
// the splitter ------
- start = DateAndTime("2007-11-30T16:15:00");
- stop = DateAndTime("2007-11-30T16:16:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:19:00");
- stop = DateAndTime("2007-11-30T16:20:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00");
b.push_back(SplittingInterval(start, stop, 3));
- start = DateAndTime("2007-11-30T16:18:00");
- stop = DateAndTime("2007-11-30T16:19:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00");
b.push_back(SplittingInterval(start, stop, 2));
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:18:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
b.push_back(SplittingInterval(start, stop, 1));
std::sort(b.begin(), b.end());
- TS_ASSERT_EQUALS(b[0].start(), DateAndTime("2007-11-30T16:15:00"));
- TS_ASSERT_EQUALS(b[1].start(), DateAndTime("2007-11-30T16:17:00"));
- TS_ASSERT_EQUALS(b[2].start(), DateAndTime("2007-11-30T16:18:00"));
- TS_ASSERT_EQUALS(b[3].start(), DateAndTime("2007-11-30T16:19:00"));
+ TS_ASSERT_EQUALS(b[0].start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00"));
+ TS_ASSERT_EQUALS(b[1].start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"));
+ TS_ASSERT_EQUALS(b[2].start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00"));
+ TS_ASSERT_EQUALS(b[3].start(), DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00"));
}
//----------------------------------------------------------------------------
@@ -506,34 +507,34 @@ public:
TimeSplitterType b;
// the splitter ------
- start = DateAndTime("2007-11-30T16:15:00");
- stop = DateAndTime("2007-11-30T16:16:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:15:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:16:00");
b.push_back(SplittingInterval(start, stop, 0));
- start = DateAndTime("2007-11-30T16:19:00");
- stop = DateAndTime("2007-11-30T16:20:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:20:00");
b.push_back(SplittingInterval(start, stop, 3));
- start = DateAndTime("2007-11-30T16:18:00");
- stop = DateAndTime("2007-11-30T16:19:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:19:00");
b.push_back(SplittingInterval(start, stop, 2));
- start = DateAndTime("2007-11-30T16:17:00");
- stop = DateAndTime("2007-11-30T16:18:00");
+ start = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00");
+ stop = DateAndTimeHelpers::createFromISO8601("2007-11-30T16:18:00");
b.push_back(SplittingInterval(start, stop, 1));
std::sort(b.begin(), b.end());
TimeSplitterType::iterator sit;
- SplittingInterval temp1(DateAndTime("2007-11-30T16:17:00"),
- DateAndTime("2007-11-30T16:17:00"), -1);
+ SplittingInterval temp1(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"), -1);
sit = std::lower_bound(b.begin(), b.end(), temp1);
int index1 = int(sit - b.begin());
TS_ASSERT_EQUALS(index1, 1);
- SplittingInterval temp2(DateAndTime("2007-11-30T16:17:10"),
- DateAndTime("2007-11-30T16:17:00"), -1);
+ SplittingInterval temp2(DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:10"),
+ DateAndTimeHelpers::createFromISO8601("2007-11-30T16:17:00"), -1);
sit = std::lower_bound(b.begin(), b.end(), temp2);
int index2 = int(sit - b.begin());
TS_ASSERT_EQUALS(index2, 2);
diff --git a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
index 8768e292cb8c7b2d7a244ae5ee2ee82e1fdff4f7..770701f70e2a59ec4be19dae983906541f7a073c 100644
--- a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
@@ -8,7 +8,7 @@
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/PseudoRandomNumberGenerator.h"
#include <Poco/Timer.h>
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <mutex>
namespace Mantid {
@@ -46,7 +46,7 @@ public:
bool buffersEvents() const override { return true; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
bool isConnected() override;
@@ -71,7 +71,7 @@ private:
int m_numExtractDataCalls; ///< Number of times extractData has been called
/// Date and time of the next time to end the run
- Mantid::Kernel::DateAndTime m_nextEndRunTime;
+ Mantid::Types::DateAndTime m_nextEndRunTime;
/// Fake run number to give
int m_runNumber;
diff --git a/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
index 55c1fc53c266942834ef449e98ff0850a283fc9b..86ebaf7781bb56d87a08f737e40709c7ff907906 100644
--- a/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
@@ -52,7 +52,7 @@ public:
bool buffersEvents() const override { return true; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
bool isConnected() override;
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h
index 7f6dcd9b57f6aa467a6956361eef01f224c6f794..82bfd20147603472b7e49965a4eac9a5d5788a6d 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISHistoDataListener.h
@@ -59,7 +59,7 @@ public:
bool buffersEvents() const override { return false; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
bool isConnected() override;
diff --git a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h
index 1a010687625c1b78c157da62d0bd9f7709bad634..d414350affd5c89ccaab391a3391867567d873ba 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISIS/ISISLiveEventDataListener.h
@@ -95,7 +95,7 @@ public:
* The value of 'now' is zero for compatibility with the SNS
* live stream.
*/
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
/** Get the data that's been buffered since the last call to this method
* (or since start() was called).
@@ -147,7 +147,7 @@ protected:
void initEventBuffer(const TCPStreamEventDataSetup &setup);
// Save received event data in the buffer workspace
void saveEvents(const std::vector<TCPStreamEventNeutron> &data,
- const Kernel::DateAndTime &pulseTime, size_t period);
+ const Mantid::Types::DateAndTime &pulseTime, size_t period);
// Set the spectra-detector map
void loadSpectraMap();
// Load the instrument
@@ -200,7 +200,7 @@ protected:
/// Protects m_eventBuffer
std::mutex m_mutex;
/// Run start time
- Kernel::DateAndTime m_startTime;
+ Mantid::Types::DateAndTime m_startTime;
/// Run number
int m_runNumber;
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
index 0fa73821a1d1bec72351b19d28e9f2d3c1819d17..fab3f44a48ec6fe5e5d96c9e1d34fa3b650e95e0 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventListener.h
@@ -58,7 +58,7 @@ public:
//----------------------------------------------------------------------
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
//----------------------------------------------------------------------
diff --git a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
index e079f73d1ec511cec1c7e7b395384fb61640e524..09fb558fa71f59de2312f11194d433a046cc11b3 100644
--- a/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
+++ b/Framework/LiveData/inc/MantidLiveData/Kafka/KafkaEventStreamDecoder.h
@@ -114,7 +114,7 @@ private:
/// Mapping of spectrum number to workspace index.
spec2index_map m_specToIdx;
/// Start time of the run
- Kernel::DateAndTime m_runStart;
+ Mantid::Types::DateAndTime m_runStart;
/// Subscriber for the run info stream
std::unique_ptr<IKafkaStreamSubscriber> m_runStream;
/// Subscriber for the run info stream
diff --git a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
index 686e453c74050ffa7e531b779d38a2f545d63be0..27361a12f05d809fb3d99a6d0772db75f568853e 100644
--- a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
+++ b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidAPI/ILiveListener.h"
namespace Mantid {
@@ -53,7 +53,7 @@ public:
protected:
void initProps();
- Mantid::Kernel::DateAndTime getStartTime() const;
+ Mantid::Types::DateAndTime getStartTime() const;
Mantid::API::IAlgorithm_sptr makeAlgorithm(bool postProcessing);
diff --git a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
index f03cf695090d409bbba1cc0a7caf4c8dc9ccbdda..7ad4712e387a9316109a7fd1f7aac5f5cbd5c7bf 100644
--- a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
@@ -50,7 +50,7 @@ public:
bool connect(const Poco::Net::SocketAddress &address) override;
void
- start(const Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ start(const Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
ILiveListener::RunStatus runStatus() override;
@@ -104,7 +104,7 @@ private:
return false;
if (m_instrumentName.empty())
return false;
- if (m_dataStartTime == Kernel::DateAndTime())
+ if (m_dataStartTime == Mantid::Types::DateAndTime())
return false;
return haveRequiredLogs();
@@ -114,7 +114,7 @@ private:
bool haveRequiredLogs();
void appendEvent(const uint32_t pixelId, const double tof,
- const Mantid::Kernel::DateAndTime pulseTime);
+ const Mantid::Types::DateAndTime pulseTime);
// tof is "Time Of Flight" and is in units of microsecondss relative to the
// start of the pulse
// (There's some documentation that says nanoseconds, but Russell Taylor
@@ -154,14 +154,14 @@ private:
bool m_stopThread{false}; // background thread checks this periodically.
// If true, the thread exits
- Kernel::DateAndTime m_startTime; // The requested start time for the data
+ Mantid::Types::DateAndTime m_startTime; // The requested start time for the data
// stream (needed by the run() function)
// Used to initialize the scan_index property if we haven't received a packet
// with the 'real' value by the time we call initWorkspacePart2. (We can't
// delay the call to initWorkspacePart2 because we might never receive a
// 'real' value for that property.
- Kernel::DateAndTime m_dataStartTime;
+ Mantid::Types::DateAndTime m_dataStartTime;
// These 2 determine whether or not we filter out events that arrive when
// the run is paused.
diff --git a/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
index 997535707fed08e8743cfc032cd7216b7ac0857c..26498f5d49015bf0e8b0be8b2fd30518e2db2612 100644
--- a/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
@@ -49,7 +49,7 @@ public:
bool buffersEvents() const override { return true; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime = Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
ILiveListener::RunStatus runStatus() override;
@@ -67,7 +67,7 @@ private:
void initMonitorWorkspace();
void appendEvent(uint32_t pixelId, double tof,
- const Mantid::Kernel::DateAndTime pulseTime);
+ const Mantid::Types::DateAndTime pulseTime);
// tof is "Time Of Flight" and is in units of microsecondss relative to the
// start of the pulse. (There's some documentation that says nanoseconds,
// but Russell Taylor assures me it's really in microseconds!)
diff --git a/Framework/LiveData/src/FakeEventDataListener.cpp b/Framework/LiveData/src/FakeEventDataListener.cpp
index 1b6214fad6228e85e4f00738cf0a72074f953a04..e06559d5554c4f197539c52fa78fd3e7d810b71d 100644
--- a/Framework/LiveData/src/FakeEventDataListener.cpp
+++ b/Framework/LiveData/src/FakeEventDataListener.cpp
@@ -3,13 +3,14 @@
#include "MantidAPI/Run.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/MersenneTwister.h"
#include "MantidKernel/WriteLock.h"
#include "MantidLiveData/Exception.h"
+#include "MantidTypes/DateAndTime.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace LiveData {
@@ -61,7 +62,8 @@ ILiveListener::RunStatus FakeEventDataListener::runStatus() {
int FakeEventDataListener::runNumber() const { return m_runNumber; }
void FakeEventDataListener::start(
- Kernel::DateAndTime /*startTime*/) // Ignore the start time for now at least
+ Mantid::Types::DateAndTime /*startTime*/) // Ignore the start time for now
+ // at least
{
// Set up the workspace buffer (probably won't know its dimensions before this
// point)
@@ -72,7 +74,8 @@ void FakeEventDataListener::start(
WorkspaceFactory::Instance().create("EventWorkspace", 2, 2, 1));
// Set a sample tof range
m_rand->setRange(40000, 60000);
- m_rand->setSeed(Kernel::DateAndTime::getCurrentTime().totalNanoseconds());
+ m_rand->setSeed(
+ Mantid::Types::DateAndTime::getCurrentTime().totalNanoseconds());
// If necessary, calculate the number of events we need to generate on each
// call of generateEvents
@@ -135,10 +138,10 @@ boost::shared_ptr<Workspace> FakeEventDataListener::extractData() {
void FakeEventDataListener::generateEvents(Poco::Timer &) {
std::lock_guard<std::mutex> _lock(m_mutex);
for (long i = 0; i < m_callbackloop; ++i) {
- m_buffer->getSpectrum(0)
- .addEventQuickly(DataObjects::TofEvent(m_rand->nextValue()));
- m_buffer->getSpectrum(1)
- .addEventQuickly(DataObjects::TofEvent(m_rand->nextValue()));
+ m_buffer->getSpectrum(0).addEventQuickly(
+ DataObjects::TofEvent(m_rand->nextValue()));
+ m_buffer->getSpectrum(1).addEventQuickly(
+ DataObjects::TofEvent(m_rand->nextValue()));
}
}
} // namespace LiveData
diff --git a/Framework/LiveData/src/FileEventDataListener.cpp b/Framework/LiveData/src/FileEventDataListener.cpp
index 16ad6c503a705fb66aa6eab20cbc0105915d2375..a778024a9f0bf6034c549c650618a9f29227c386 100644
--- a/Framework/LiveData/src/FileEventDataListener.cpp
+++ b/Framework/LiveData/src/FileEventDataListener.cpp
@@ -113,7 +113,7 @@ ILiveListener::RunStatus FileEventDataListener::runStatus() {
int FileEventDataListener::runNumber() const { return m_runNumber; }
void FileEventDataListener::start(
- Kernel::DateAndTime /*startTime*/) // Ignore the start time
+ Mantid::Types::DateAndTime /*startTime*/) // Ignore the start time
{
// Kick off loading the first chunk (which will include loading the instrument
// etc.)
diff --git a/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp b/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp
index c6d3b8f261a6e7e06595d8ebf3bf374512fd21d8..7e8097ef23524f162f77ca3d1900c660a4f903d4 100644
--- a/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp
+++ b/Framework/LiveData/src/ISIS/ISISHistoDataListener.cpp
@@ -149,7 +149,7 @@ int ISISHistoDataListener::runNumber() const {
}
void ISISHistoDataListener::start(
- Kernel::DateAndTime /*startTime*/) // Ignore the start time
+ Mantid::Types::DateAndTime /*startTime*/) // Ignore the start time
{}
/**
diff --git a/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp b/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp
index 9de9f56e9f93c67c1c725546db13c0b7411f4c36..edf7c2edcdbfff1a70dce78968a496c71c92ab28 100644
--- a/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp
+++ b/Framework/LiveData/src/ISIS/ISISLiveEventDataListener.cpp
@@ -10,7 +10,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/UnitFactory.h"
@@ -150,7 +150,7 @@ bool ISISLiveEventDataListener::connect(
}
// start event collection
-void ISISLiveEventDataListener::start(Kernel::DateAndTime startTime) {
+void ISISLiveEventDataListener::start(Mantid::Types::DateAndTime startTime) {
(void)startTime;
m_thread.start(*this);
}
@@ -247,7 +247,7 @@ void ISISLiveEventDataListener::run() {
CollectJunk(events.head_n);
// absolute pulse (frame) time
- Mantid::Kernel::DateAndTime pulseTime =
+ Mantid::Types::DateAndTime pulseTime =
m_startTime + static_cast<double>(events.head_n.frame_time_zero);
// Save the pulse charge in the logs
double protons = static_cast<double>(events.head_n.protons);
@@ -375,7 +375,7 @@ void ISISLiveEventDataListener::initEventBuffer(
*/
void ISISLiveEventDataListener::saveEvents(
const std::vector<TCPStreamEventNeutron> &data,
- const Kernel::DateAndTime &pulseTime, size_t period) {
+ const Mantid::Types::DateAndTime &pulseTime, size_t period) {
std::lock_guard<std::mutex> scopedLock(m_mutex);
if (period >= static_cast<size_t>(m_numberOfPeriods)) {
diff --git a/Framework/LiveData/src/Kafka/KafkaEventListener.cpp b/Framework/LiveData/src/Kafka/KafkaEventListener.cpp
index 4a350377f9f08e9bf2d3e30ad1934270e77b851c..ceafc9d8358be4413ee298e528ddbefd785a34e9 100644
--- a/Framework/LiveData/src/Kafka/KafkaEventListener.cpp
+++ b/Framework/LiveData/src/Kafka/KafkaEventListener.cpp
@@ -38,7 +38,7 @@ bool KafkaEventListener::connect(const Poco::Net::SocketAddress &address) {
}
/// @copydoc ILiveListener::start
-void KafkaEventListener::start(Kernel::DateAndTime startTime) {
+void KafkaEventListener::start(Mantid::Types::DateAndTime startTime) {
bool startNow = true;
// Workaround for existing LiveListener interface
// startTime of 0 means start from now
diff --git a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
index 0c318fc3885b28a6b72f084ea46be3e2937f02b4..08e0d34884f0a927e8eb6f6f705c9fddaa9f3d6d 100644
--- a/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
+++ b/Framework/LiveData/src/Kafka/KafkaEventStreamDecoder.cpp
@@ -4,7 +4,7 @@
#include "MantidAPI/Run.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -24,6 +24,8 @@ GCC_DIAG_ON(conversion)
#include <functional>
#include <map>
+using namespace Mantid::Types;
+
namespace {
/// Logger
Mantid::Kernel::Logger g_log("KafkaEventStreamDecoder");
@@ -44,7 +46,7 @@ std::string RUN_START_PROPERTY = "run_start";
*/
template <typename T>
void appendToLog(Mantid::API::Run &mutableRunInfo, const std::string &name,
- const Mantid::Kernel::DateAndTime &time, T value) {
+ const Mantid::Types::DateAndTime &time, T value) {
if (mutableRunInfo.hasProperty(name)) {
auto property = mutableRunInfo.getTimeSeriesProperty<T>(name);
property->addValue(time, value);
@@ -101,7 +103,6 @@ void addSampleEnvLogs(
namespace Mantid {
namespace LiveData {
using DataObjects::TofEvent;
-using Kernel::DateAndTime;
// -----------------------------------------------------------------------------
// Public members
@@ -211,7 +212,7 @@ bool KafkaEventStreamDecoder::hasReachedEndOfRun() noexcept {
*/
API::Workspace_sptr KafkaEventStreamDecoder::extractData() {
if (m_exception) {
- throw * m_exception;
+ throw *m_exception;
}
m_extractWaiting = true;
@@ -384,7 +385,8 @@ void KafkaEventStreamDecoder::initLocalCaches() {
std::ostringstream os;
os << "KafkaEventStreamDecoder::initLocalEventBuffer() - Invalid "
"spectra/detector mapping. Expected matched length arrays but "
- "found nspec=" << nspec << ", ndet=" << nudet;
+ "found nspec="
+ << nspec << ", ndet=" << nudet;
throw std::runtime_error(os.str());
}
// Create buffer
diff --git a/Framework/LiveData/src/LiveDataAlgorithm.cpp b/Framework/LiveData/src/LiveDataAlgorithm.cpp
index 1e4d8670c592aba116cbf389b96589f30e703898..9d0661c813d9944a88b2883f064c18cf61f7a714 100644
--- a/Framework/LiveData/src/LiveDataAlgorithm.cpp
+++ b/Framework/LiveData/src/LiveDataAlgorithm.cpp
@@ -4,16 +4,18 @@
#include "MantidAPI/LiveListenerFactory.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/FacilityInfo.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/Strings.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include <boost/algorithm/string/trim.hpp>
#include <unordered_set>
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using namespace Mantid::Types;
namespace Mantid {
namespace LiveData {
@@ -257,11 +259,11 @@ void LiveDataAlgorithm::setLiveListener(
//----------------------------------------------------------------------------------------------
/** @return the value of the StartTime property */
-Mantid::Kernel::DateAndTime LiveDataAlgorithm::getStartTime() const {
+Mantid::Types::DateAndTime LiveDataAlgorithm::getStartTime() const {
std::string date = getPropertyValue("StartTime");
if (date.empty())
return DateAndTime();
- return DateAndTime(date);
+ return DateAndTimeHelpers::createFromISO8601(date);
}
//----------------------------------------------------------------------------------------------
diff --git a/Framework/LiveData/src/LoadLiveData.cpp b/Framework/LiveData/src/LoadLiveData.cpp
index d9584aefe11764fc77c3d0ef762de7582d16dffd..75f10b1eaa655d900b6dc31d0c8131042e8c4e1f 100644
--- a/Framework/LiveData/src/LoadLiveData.cpp
+++ b/Framework/LiveData/src/LoadLiveData.cpp
@@ -101,8 +101,8 @@ LoadLiveData::runProcessing(Mantid::API::Workspace_sptr inputWS,
for (auto prop : proplist) {
if ((prop->direction() == 0) && (!inputPropertyWorkspaceFound)) {
if (boost::ends_with(prop->type(), "Workspace")) {
- g_log.information() << "Using " << prop->name()
- << " as the input property.\n";
+ g_log.information()
+ << "Using " << prop->name() << " as the input property.\n";
alg->setPropertyValue(prop->name(), inputName);
inputPropertyWorkspaceFound = true;
}
@@ -399,7 +399,7 @@ void LoadLiveData::exec() {
}
// TODO: Have the ILiveListener tell me exactly the time stamp
- DateAndTime lastTimeStamp = DateAndTime::getCurrentTime();
+ Types::DateAndTime lastTimeStamp = Types::DateAndTime::getCurrentTime();
this->setPropertyValue("LastTimeStamp", lastTimeStamp.toISO8601String());
// Now we process the chunk
diff --git a/Framework/LiveData/src/MonitorLiveData.cpp b/Framework/LiveData/src/MonitorLiveData.cpp
index dfdcdd67fecfd13a0fad4f52f75be5f7c1e5134d..10bedc09123c236eeb12f931bb02f1f96486a8c5 100644
--- a/Framework/LiveData/src/MonitorLiveData.cpp
+++ b/Framework/LiveData/src/MonitorLiveData.cpp
@@ -12,6 +12,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
namespace Mantid {
namespace LiveData {
@@ -86,8 +87,8 @@ void MonitorLiveData::doClone(const std::string &originalName,
if (newMonitorWS) // If there was a monitor workspace, set it back on
// the result
{
- ads.retrieveWS<MatrixWorkspace>(newName)
- ->setMonitorWorkspace(newMonitorWS);
+ ads.retrieveWS<MatrixWorkspace>(newName)->setMonitorWorkspace(
+ newMonitorWS);
}
} else {
std::cout << "Not cloning\n";
@@ -226,8 +227,9 @@ void MonitorLiveData::exec() {
seconds = DateAndTime::secondsFromDuration(now - lastTime);
if (seconds > UpdateEvery)
g_log.warning() << "Cannot process live data as quickly as requested: "
- "requested every " << UpdateEvery
- << " seconds but it takes " << seconds << " seconds!\n";
+ "requested every "
+ << UpdateEvery << " seconds but it takes " << seconds
+ << " seconds!\n";
} // loop until aborted
// Set the outputs (only applicable when RunTransitionBehavior is "Stop")
diff --git a/Framework/LiveData/src/SNSLiveEventDataListener.cpp b/Framework/LiveData/src/SNSLiveEventDataListener.cpp
index 5fa90939a83df42ef7a2c6615f5ce7088a8aa64c..8c31d740148e73c6bd7110ffe5bd522586bcb209 100644
--- a/Framework/LiveData/src/SNSLiveEventDataListener.cpp
+++ b/Framework/LiveData/src/SNSLiveEventDataListener.cpp
@@ -11,7 +11,6 @@
#include "MantidDataObjects/Events.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -19,6 +18,7 @@
#include "MantidKernel/WriteLock.h"
#include "MantidLiveData/Exception.h"
#include "MantidLiveData/SNSLiveEventDataListener.h"
+#include "MantidTypes/DateAndTime.h"
// Includes for parsing the XML device descriptions
#include <Poco/DOM/AutoPtr.h>
@@ -37,6 +37,7 @@
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
namespace { // anonymous namespace
// Time we'll wait on a receive call (in seconds)
@@ -49,7 +50,7 @@ const std::string SCAN_PROPERTY("scan_index");
const std::string PROTON_CHARGE_PROPERTY("proton_charge");
// Helper function to get a DateAndTime value from an ADARA packet header
-Mantid::Kernel::DateAndTime timeFromPacket(const ADARA::PacketHeader &hdr) {
+Mantid::Types::DateAndTime timeFromPacket(const ADARA::PacketHeader &hdr) {
const uint32_t seconds = static_cast<uint32_t>(hdr.pulseId() >> 32);
const uint32_t nanoseconds = hdr.pulseId() & 0xFFFFFFFF;
@@ -70,7 +71,7 @@ DECLARE_LISTENER(SNSLiveEventDataListener)
namespace {
/// static logger
Kernel::Logger g_log("SNSLiveEventDataListener");
-}
+} // namespace
/// Constructor
SNSLiveEventDataListener::SNSLiveEventDataListener()
@@ -180,7 +181,8 @@ bool SNSLiveEventDataListener::isConnected() { return m_isConnected; }
/// @param startTime Specifies how much historical data the SMS should send
/// before continuing the current 'live' data. Use 0 to indicate no
/// historical data.
-void SNSLiveEventDataListener::start(const Kernel::DateAndTime startTime) {
+void SNSLiveEventDataListener::start(
+ const Mantid::Types::DateAndTime startTime) {
// Save the startTime and kick off the background thread
// (Can't really do anything else until we send the hello packet and the SMS
// sends us
@@ -401,7 +403,7 @@ bool SNSLiveEventDataListener::rxPacket(const ADARA::BankedEventPkt &pkt) {
std::lock_guard<std::mutex> scopedLock(m_mutex);
// Timestamp for the events
- Mantid::Kernel::DateAndTime eventTime = timeFromPacket(pkt);
+ Mantid::Types::DateAndTime eventTime = timeFromPacket(pkt);
// Save the pulse charge in the logs (*10 because we want the units to be
// picoCulombs, and ADARA sends them out in units of 10pC)
@@ -483,8 +485,9 @@ bool SNSLiveEventDataListener::rxPacket(const ADARA::BeamMonitorPkt &pkt) {
// sufficient.
g_log.error()
<< "Mantid cannot handle monitor ID's higher than 5. If "
- << monitorID << " is actually valid, then an appropriate "
- "entry must be made to the "
+ << monitorID
+ << " is actually valid, then an appropriate "
+ "entry must be made to the "
<< " ADDABLE list at the top of Framework/API/src/Run.cpp\n";
} else {
std::string monName("monitor");
@@ -1107,9 +1110,9 @@ bool SNSLiveEventDataListener::rxPacket(const ADARA::DeviceDescriptorPkt &pkt) {
prop = new TimeSeriesProperty<std::string>(pvName);
} else {
// invalid type string
- g_log.warning() << "Ignoring process variable " << pvName
- << " because it had an unrecognized type ("
- << pvType << ").\n";
+ g_log.warning()
+ << "Ignoring process variable " << pvName
+ << " because it had an unrecognized type (" << pvType << ").\n";
}
if (prop) {
@@ -1337,7 +1340,7 @@ bool SNSLiveEventDataListener::haveRequiredLogs() {
/// Adds an event to the workspace
void SNSLiveEventDataListener::appendEvent(
const uint32_t pixelId, const double tof,
- const Mantid::Kernel::DateAndTime pulseTime)
+ const Mantid::Types::DateAndTime pulseTime)
// NOTE: This function does NOT lock the mutex! Make sure you do that
// before calling this function!
{
@@ -1467,7 +1470,7 @@ ILiveListener::RunStatus SNSLiveEventDataListener::runStatus() {
// Don't clear this for BeginRun because it was set up in the parser
// for the RunStatus packet that signaled the beginning of a new
// run and is thus already set to the correct value.
- m_dataStartTime = Kernel::DateAndTime();
+ m_dataStartTime = Mantid::Types::DateAndTime();
}
// NOTE: It's probably not necessary to clear the instrument name
diff --git a/Framework/LiveData/src/StartLiveData.cpp b/Framework/LiveData/src/StartLiveData.cpp
index 29830267bf8ea6e1fbd159a1629cf68fa03e079f..f20b82ebb48459070edc93684bad050d9ecee57f 100644
--- a/Framework/LiveData/src/StartLiveData.cpp
+++ b/Framework/LiveData/src/StartLiveData.cpp
@@ -1,20 +1,23 @@
#include "MantidLiveData/StartLiveData.h"
-#include "MantidKernel/System.h"
-#include "MantidLiveData/LoadLiveData.h"
-#include "MantidLiveData/MonitorLiveData.h"
#include "MantidAPI/AlgorithmManager.h"
-#include "MantidAPI/AlgorithmProxy.h"
#include "MantidAPI/AlgorithmProperty.h"
+#include "MantidAPI/AlgorithmProxy.h"
#include "MantidAPI/LiveListenerFactory.h"
#include "MantidAPI/Workspace.h"
-#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/ArrayBoundedValidator.h"
+#include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/System.h"
+#include "MantidLiveData/LoadLiveData.h"
+#include "MantidLiveData/MonitorLiveData.h"
#include <Poco/ActiveResult.h>
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
+
namespace Mantid {
namespace LiveData {
@@ -24,7 +27,7 @@ DECLARE_ALGORITHM(StartLiveData)
namespace {
/// name for a group of properties that get copied from the listener
const char *listenerPropertyGroup = "ListenerProperties";
-}
+} // namespace
//----------------------------------------------------------------------------------------------
/// Algorithm's name for identification. @see Algorithm::name
@@ -164,7 +167,8 @@ void StartLiveData::exec() {
this->setPropertyValue("StartTime", "1990-01-01T00:00:01");
else {
// Validate the StartTime property. Don't allow times from the future
- DateAndTime reqStartTime(this->getPropertyValue("StartTime"));
+ auto reqStartTime = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ this->getPropertyValue("StartTime"));
// DateAndTime will throw an exception if it can't interpret the string, so
// we don't need to test for that condition.
diff --git a/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp b/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp
index 1b7285a9bd98e597304f4fe0d56b8c7bb118c32a..8cd3124888b97e57b8c2330a541e302d9b9ae757 100644
--- a/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp
+++ b/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp
@@ -11,14 +11,14 @@
#include "MantidKernel/UnitFactory.h"
#include "MantidLiveData/Exception.h"
-#include <Poco/Net/NetException.h>
-#include <Poco/Net/StreamSocket.h>
#include <Poco/Net/DatagramSocket.h>
+#include <Poco/Net/NetException.h>
#include <Poco/Net/SocketAddress.h>
+#include <Poco/Net/StreamSocket.h>
-#include <string>
-#include <fstream>
#include <exception>
+#include <fstream>
+#include <string>
using namespace Mantid::Kernel;
using namespace Mantid::API;
@@ -121,13 +121,13 @@ typedef struct neutron_event_struct NEUTRON_EVENT, *NEUTRON_EVENT_PTR;
****************************************************************************/
// Helper function to get a DateAndTime value from a pulse_id_struct
-Mantid::Kernel::DateAndTime timeFromPulse(const pulse_id_struct *p) {
+Mantid::Types::DateAndTime timeFromPulse(const pulse_id_struct *p) {
uint32_t seconds = p->pulseIDhigh;
uint32_t nanoseconds = p->pulseIDlow;
// Make sure we pick the correct constructor (the Mac gets an ambiguous error)
- return DateAndTime(static_cast<int64_t>(seconds),
- static_cast<int64_t>(nanoseconds));
+ return Mantid::Types::DateAndTime(static_cast<int64_t>(seconds),
+ static_cast<int64_t>(nanoseconds));
}
namespace Mantid {
@@ -137,7 +137,7 @@ DECLARE_LISTENER(TOPAZLiveEventDataListener)
namespace {
/// static logger
Kernel::Logger g_log("SNSLiveEventDataListener");
-}
+} // namespace
/// Constructor
TOPAZLiveEventDataListener::TOPAZLiveEventDataListener()
@@ -264,7 +264,7 @@ bool TOPAZLiveEventDataListener::isConnected() { return m_isConnected; }
/// it and stores the resulting events in a temporary workspace.
/// @param startTime Ignored. This class doesn't have the capability to
/// replay historical data.
-void TOPAZLiveEventDataListener::start(Kernel::DateAndTime startTime) {
+void TOPAZLiveEventDataListener::start(Mantid::Types::DateAndTime startTime) {
(void)startTime; // Keep the compiler from complaining about unsed variable
// Initialize the workspace
@@ -372,7 +372,7 @@ void TOPAZLiveEventDataListener::run() {
}
// Timestamp for the events
- Mantid::Kernel::DateAndTime eventTime = timeFromPulse(&pid[i]);
+ Mantid::Types::DateAndTime eventTime = timeFromPulse(&pid[i]);
std::lock_guard<std::mutex> scopedLock(m_mutex);
// Save the pulse charge in the logs
@@ -519,7 +519,7 @@ void TOPAZLiveEventDataListener::initMonitorWorkspace() {
/// Adds an event to the workspace
void TOPAZLiveEventDataListener::appendEvent(
- uint32_t pixelId, double tof, const Mantid::Kernel::DateAndTime pulseTime)
+ uint32_t pixelId, double tof, const Mantid::Types::DateAndTime pulseTime)
// NOTE: This function does NOT lock the mutex! Make sure you do that
// before calling this function!
{
diff --git a/Framework/LiveData/test/KafkaTesting.h b/Framework/LiveData/test/KafkaTesting.h
index 5a9e37693d2e4d4fc61969d0a26c7be4c6eb11ee..bbdc057eb22c71cb1f77f9e6a0b16f1b78df3135 100644
--- a/Framework/LiveData/test/KafkaTesting.h
+++ b/Framework/LiveData/test/KafkaTesting.h
@@ -1,9 +1,10 @@
#ifndef MANTID_LIVEDATA_ISISKAFKATESTING_H_
#define MANTID_LIVEDATA_ISISKAFKATESTING_H_
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/WarningSuppressions.h"
#include "MantidLiveData/Kafka/IKafkaBroker.h"
+#include "MantidTypes/DateAndTime.h"
#include <gmock/gmock.h>
GCC_DIAG_OFF(conversion)
@@ -186,6 +187,6 @@ private:
// These match the detector numbers in HRPDTEST_Definition.xml
std::vector<int32_t> m_detid = {1001, 1002, 1100, 901000, 10100};
};
-}
+} // namespace ISISKafkaTesting
#endif // MANTID_LIVEDATA_ISISKAFKAEVENTSTREAMDECODERTESTMOCKS_H_
diff --git a/Framework/LiveData/test/TestDataListener.cpp b/Framework/LiveData/test/TestDataListener.cpp
index b7eb76a0a2e591a48254733d5449f1a9310d399f..2193349e3638fd5245047e24a70733b09492123c 100644
--- a/Framework/LiveData/test/TestDataListener.cpp
+++ b/Framework/LiveData/test/TestDataListener.cpp
@@ -21,7 +21,7 @@ DECLARE_LISTENER(TestDataListener)
TestDataListener::TestDataListener()
: LiveListener(), m_buffer(),
m_rand(new Kernel::MersenneTwister(
- Kernel::DateAndTime::getCurrentTime().totalNanoseconds(), 40000,
+ Mantid::Types::DateAndTime::getCurrentTime().totalNanoseconds(), 40000,
60000)),
m_changeStatusAfter(0), m_newStatus(ILiveListener::EndRun) {
// Set up the first workspace buffer
@@ -79,7 +79,7 @@ ILiveListener::RunStatus TestDataListener::runStatus() {
int TestDataListener::runNumber() const { return 999; }
void TestDataListener::start(
- Kernel::DateAndTime /*startTime*/) // Ignore the start time
+ Mantid::Types::DateAndTime /*startTime*/) // Ignore the start time
{}
/** Create the default empty event workspace */
diff --git a/Framework/LiveData/test/TestDataListener.h b/Framework/LiveData/test/TestDataListener.h
index b9a5391ad54214466a6a4ab3a70f6bdfe33b36d8..0533ce14bbad8c8647515ed77240cd34a892dfc1 100644
--- a/Framework/LiveData/test/TestDataListener.h
+++ b/Framework/LiveData/test/TestDataListener.h
@@ -22,7 +22,8 @@ public:
bool buffersEvents() const override { return true; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime =
+ Mantid::Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
bool isConnected() override;
diff --git a/Framework/LiveData/test/TestGroupDataListener.cpp b/Framework/LiveData/test/TestGroupDataListener.cpp
index 29e20383388db8ef28ed10e888b621e5b6173fd7..be8844ccd1decec2b111bb6a79248e5cb60f0d02 100644
--- a/Framework/LiveData/test/TestGroupDataListener.cpp
+++ b/Framework/LiveData/test/TestGroupDataListener.cpp
@@ -40,7 +40,7 @@ int TestGroupDataListener::runNumber() const { return 0; }
void TestGroupDataListener::setSpectra(const std::vector<specnum_t> &) {}
void TestGroupDataListener::start(
- Kernel::DateAndTime /*startTime*/) // Ignore the start time
+ Mantid::Types::DateAndTime /*startTime*/) // Ignore the start time
{}
/** Create the default empty event workspace */
diff --git a/Framework/LiveData/test/TestGroupDataListener.h b/Framework/LiveData/test/TestGroupDataListener.h
index f1cd891f90d89c5afdb83c1886c5e2f99b45f3cc..da53ff9feee5593847d2bd891d7e89635ce7c998 100644
--- a/Framework/LiveData/test/TestGroupDataListener.h
+++ b/Framework/LiveData/test/TestGroupDataListener.h
@@ -22,7 +22,7 @@ public:
bool buffersEvents() const override { return true; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ void start(Types::DateAndTime startTime = Types::DateAndTime()) override;
boost::shared_ptr<API::Workspace> extractData() override;
bool isConnected() override;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
index 2768a7ac1aa17f7f8aba067ad49b41bbc9a3a5b6..c77c3e87eb0a4bf985fdcf763c1fd7ebbd4eccf5 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
@@ -76,9 +76,9 @@ private:
/// Parse data table workspace to a vector of matrix workspaces
std::vector<API::MatrixWorkspace_sptr> convertToMatrixWorkspace(
DataObjects::TableWorkspace_sptr tablews,
- API::MatrixWorkspace_const_sptr parentws, Kernel::DateAndTime runstart,
+ API::MatrixWorkspace_const_sptr parentws, Mantid::Types::DateAndTime runstart,
std::map<std::string, std::vector<double>> &logvecmap,
- std::vector<Kernel::DateAndTime> &vectimes);
+ std::vector<Mantid::Types::DateAndTime> &vectimes);
/// Create an MDEventWorspace by converting vector of matrix workspace data
API::IMDEventWorkspace_sptr
@@ -103,7 +103,7 @@ private:
/// Load one run (one pt.) to a matrix workspace
API::MatrixWorkspace_sptr loadRunToMatrixWS(
DataObjects::TableWorkspace_sptr tablews, size_t irow,
- API::MatrixWorkspace_const_sptr parentws, Kernel::DateAndTime runstart,
+ API::MatrixWorkspace_const_sptr parentws, Mantid::Types::DateAndTime runstart,
size_t ipt, size_t irotangle, size_t itime,
const std::vector<std::pair<size_t, size_t>> anodelist, double &duration);
@@ -116,7 +116,7 @@ private:
void
appendSampleLogs(API::IMDEventWorkspace_sptr mdws,
const std::map<std::string, std::vector<double>> &logvecmap,
- const std::vector<Kernel::DateAndTime> &vectimes);
+ const std::vector<Mantid::Types::DateAndTime> &vectimes);
/// Parse detector efficiency table workspace to map
std::map<detid_t, double>
diff --git a/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp b/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
index 266e819cebbc5460b7d44639a261cbca99974e60..ae5978d74a9a739555decf6f90cdf6e43b5fe2d4 100644
--- a/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
+++ b/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
@@ -13,6 +13,7 @@
#include "MantidGeometry/IComponent.h"
#include "MantidGeometry/IDetector.h"
#include "MantidGeometry/MDGeometry/GeneralFrame.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -27,6 +28,7 @@ using namespace Mantid::Kernel;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
using namespace Mantid::DataObjects;
+using namespace Mantid::Types;
DECLARE_ALGORITHM(ConvertSpiceDataToRealSpace)
@@ -109,7 +111,7 @@ void ConvertSpiceDataToRealSpace::exec() {
// Use parent workspace's first
std::string runstartstr = parentWS->run().getProperty("run_start")->value();
try {
- DateAndTime temprunstart(runstartstr);
+ auto temprunstart = DateAndTimeHelpers::createFromISO8601(runstartstr);
runstart = temprunstart;
hasrunstartset = true;
} catch (...) {
@@ -124,7 +126,7 @@ void ConvertSpiceDataToRealSpace::exec() {
// Use user given
std::string runstartstr = getProperty("RunStart");
try {
- DateAndTime temprunstart(runstartstr);
+ auto temprunstart = DateAndTimeHelpers::createFromISO8601(runstartstr);
runstart = temprunstart;
hasrunstartset = true;
} catch (...) {
@@ -141,7 +143,7 @@ void ConvertSpiceDataToRealSpace::exec() {
// Convert table workspace to a list of 2D workspaces
std::map<std::string, std::vector<double>> logvecmap;
- std::vector<Kernel::DateAndTime> vectimes;
+ std::vector<Mantid::Types::DateAndTime> vectimes;
// Set up range for x/y/z
m_extentMins.resize(3);
@@ -203,9 +205,10 @@ void ConvertSpiceDataToRealSpace::exec() {
std::vector<MatrixWorkspace_sptr>
ConvertSpiceDataToRealSpace::convertToMatrixWorkspace(
DataObjects::TableWorkspace_sptr tablews,
- API::MatrixWorkspace_const_sptr parentws, Kernel::DateAndTime runstart,
+ API::MatrixWorkspace_const_sptr parentws,
+ Mantid::Types::DateAndTime runstart,
std::map<std::string, std::vector<double>> &logvecmap,
- std::vector<Kernel::DateAndTime> &vectimes) {
+ std::vector<Mantid::Types::DateAndTime> &vectimes) {
// Get table workspace's column information
size_t ipt, irotangle, itime;
std::vector<std::pair<size_t, size_t>> anodelist;
@@ -281,7 +284,7 @@ void ConvertSpiceDataToRealSpace::parseSampleLogs(
*/
MatrixWorkspace_sptr ConvertSpiceDataToRealSpace::loadRunToMatrixWS(
DataObjects::TableWorkspace_sptr tablews, size_t irow,
- MatrixWorkspace_const_sptr parentws, Kernel::DateAndTime runstart,
+ MatrixWorkspace_const_sptr parentws, Mantid::Types::DateAndTime runstart,
size_t ipt, size_t irotangle, size_t itime,
const std::vector<std::pair<size_t, size_t>> anodelist, double &duration) {
// New workspace from parent workspace
@@ -434,7 +437,7 @@ void ConvertSpiceDataToRealSpace::readTableInfo(
void ConvertSpiceDataToRealSpace::appendSampleLogs(
IMDEventWorkspace_sptr mdws,
const std::map<std::string, std::vector<double>> &logvecmap,
- const std::vector<Kernel::DateAndTime> &vectimes) {
+ const std::vector<Mantid::Types::DateAndTime> &vectimes) {
// Check!
size_t numexpinfo = mdws->getNumExperimentInfo();
if (numexpinfo == 0)
@@ -457,7 +460,7 @@ void ConvertSpiceDataToRealSpace::appendSampleLogs(
// Add run_start and start_time to each ExperimentInfo
for (size_t i = 0; i < vectimes.size(); ++i) {
- Kernel::DateAndTime runstart = vectimes[i];
+ Mantid::Types::DateAndTime runstart = vectimes[i];
mdws->getExperimentInfo(static_cast<uint16_t>(i))
->mutableRun()
.addLogData(new PropertyWithValue<std::string>(
@@ -747,5 +750,5 @@ void ConvertSpiceDataToRealSpace::correctByDetectorEfficiency(
}
}
-} // namespace DataHandling
+} // namespace MDAlgorithms
} // namespace Mantid
diff --git a/Framework/MDAlgorithms/test/ConvertCWPDMDToSpectraTest.h b/Framework/MDAlgorithms/test/ConvertCWPDMDToSpectraTest.h
index dd711d007f72609cad931dd688c8520c9365b59d..0aac0398ee91b11da5fc1546c7b6c8e35de20d71 100644
--- a/Framework/MDAlgorithms/test/ConvertCWPDMDToSpectraTest.h
+++ b/Framework/MDAlgorithms/test/ConvertCWPDMDToSpectraTest.h
@@ -9,17 +9,19 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
#include "MantidDataHandling/LoadSpiceAscii.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/Unit.h"
#include "MantidMDAlgorithms/ConvertCWPDMDToSpectra.h"
#include "MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h"
-using Mantid::MDAlgorithms::ConvertCWPDMDToSpectra;
using Mantid::DataHandling::LoadSpiceAscii;
+using Mantid::MDAlgorithms::ConvertCWPDMDToSpectra;
using Mantid::MDAlgorithms::ConvertSpiceDataToRealSpace;
using namespace Mantid::API;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class ConvertCWPDMDToSpectraTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/MDAlgorithms/test/ConvertSpiceDataToRealSpaceTest.h b/Framework/MDAlgorithms/test/ConvertSpiceDataToRealSpaceTest.h
index 53007f7afc1485a3777889268383219044b28e7c..b9d5f64939eb66e2ce23a4bdfab354951062ebd8 100644
--- a/Framework/MDAlgorithms/test/ConvertSpiceDataToRealSpaceTest.h
+++ b/Framework/MDAlgorithms/test/ConvertSpiceDataToRealSpaceTest.h
@@ -20,6 +20,7 @@
#include "MantidKernel/Property.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
using Mantid::MDAlgorithms::ConvertSpiceDataToRealSpace;
using Mantid::DataHandling::LoadInstrument;
@@ -28,6 +29,7 @@ using Mantid::DataHandling::LoadSpiceAscii;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
class ConvertSpiceDataToRealSpaceTest : public CxxTest::TestSuite {
public:
diff --git a/Framework/Nexus/inc/MantidNexus/NexusClasses.h b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
index b8ef1bb2c3bf1fefbc62a6d58fed7d660d8a6a04..380ba0ffcd14464cc21fa45387b2a459a4c3eb83 100644
--- a/Framework/Nexus/inc/MantidNexus/NexusClasses.h
+++ b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
@@ -10,8 +10,8 @@
#include "MantidKernel/TimeSeriesProperty.h"
#include <nexus/napi.h>
-#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
+#include <boost/shared_ptr.hpp>
#include <map>
//----------------------------------------------------------------------
// Forward declaration
@@ -48,8 +48,8 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
/** Structure for keeping information about a Nexus data set,
-* such as the dimensions and the type
-*/
+ * such as the dimensions and the type
+ */
struct NXInfo {
NXInfo() : nxname(), rank(0), dims(), type(-1), stat(NX_ERROR) {}
std::string nxname; ///< name of the object
@@ -61,7 +61,7 @@ struct NXInfo {
};
/** Information about a Nexus class
-*/
+ */
struct NXClassInfo {
NXClassInfo() : nxname(), nxclass(), datatype(-1), stat(NX_ERROR) {}
std::string nxname; ///< name of the object
@@ -73,15 +73,15 @@ struct NXClassInfo {
};
/**
-* LoadNexusProcessed and SaveNexusProcessed need to share some attributes, put
-* them at
-* namespace level here
-*/
+ * LoadNexusProcessed and SaveNexusProcessed need to share some attributes, put
+ * them at
+ * namespace level here
+ */
/// Default block size for reading and writing processed files
const int g_processed_blocksize = 8;
/** Nexus attributes. The type of each attribute is NX_CHAR
-*/
+ */
class DLLExport NXAttributes {
public:
int n() const { return int(m_values.size()); } ///< number of attributes
@@ -103,8 +103,8 @@ private:
class NXClass;
/** The base abstract class for NeXus classes and data sets.
-* NX classes and data sets are defined at www.nexusformat.org
-*/
+ * NX classes and data sets are defined at www.nexusformat.org
+ */
class DLLExport NXObject {
friend class NXDataSet; ///< a friend class declaration
friend class NXClass; ///< a friend class declaration
@@ -137,18 +137,17 @@ private:
};
/** Abstract base class for a Nexus data set. A typical use include:
-* <ul>
-* <li>Creating a dataset object using either the concrete type constructor
-* or specialized methods of NXClass'es</li>
-* <li>Opening the dataset with open() method. Specialized NXClass creation
-* methods call open() internally
-* (so no need to call it again).</li>
-* <li>Loading the data using load(...) method. The data can be loaded
-* either in full or by chunks of smaller rank (dimension)</li>
-* </ul>
-* There is no need to free the memory allocated by the NXDataSet as it is done
-* at the destruction.
-*/
+ * <ul>
+ * <li>Creating a dataset object using either the concrete type
+ * constructor or specialized methods of NXClass'es</li> <li>Opening the dataset
+ * with open() method. Specialized NXClass creation methods call open()
+ * internally (so no need to call it again).</li> <li>Loading the data using
+ * load(...) method. The data can be loaded either in full or by chunks of
+ * smaller rank (dimension)</li>
+ * </ul>
+ * There is no need to free the memory allocated by the NXDataSet as it is done
+ * at the destruction.
+ */
class DLLExport NXDataSet : public NXObject {
public:
// Constructor
@@ -177,23 +176,23 @@ public:
/// Returns the Nexus type of the data. The types are defied in napi.h
int type() const { return m_info.type; }
/** Load the data from the file. Calling this method with all default
- * arguments
- * makes it to read in all the data.
- * @param blocksize :: The size of the block of data that should be read.
- * Note that this is only used for rank 2 and 3 datasets currently
- * @param i :: Calling load with non-negative i reads in a chunk of dimension
- * rank()-1 and i is the index
- * of the chunk. The rank of the data must be >= 1
- * @param j :: Non-negative value makes it read a chunk of dimension
- * rank()-2. i and j are its indices.
- * The rank of the data must be >= 2
- * @param k :: Non-negative value makes it read a chunk of dimension
- * rank()-3. i,j and k are its indices.
- * The rank of the data must be >= 3
- * @param l :: Non-negative value makes it read a chunk of dimension
- * rank()-4. i,j,k and l are its indices.
- * The rank of the data must be 4
- */
+ * arguments
+ * makes it to read in all the data.
+ * @param blocksize :: The size of the block of data that should be read.
+ * Note that this is only used for rank 2 and 3 datasets currently
+ * @param i :: Calling load with non-negative i reads in a chunk of
+ * dimension rank()-1 and i is the index of the chunk. The rank of the data
+ * must be >= 1
+ * @param j :: Non-negative value makes it read a chunk of dimension
+ * rank()-2. i and j are its indices.
+ * The rank of the data must be >= 2
+ * @param k :: Non-negative value makes it read a chunk of dimension
+ * rank()-3. i,j and k are its indices.
+ * The rank of the data must be >= 3
+ * @param l :: Non-negative value makes it read a chunk of dimension
+ * rank()-4. i,j,k and l are its indices.
+ * The rank of the data must be 4
+ */
virtual void load(const int blocksize = 1, int i = -1, int j = -1, int k = -1,
int l = -1) {
// Avoid compiler warnings
@@ -214,21 +213,21 @@ private:
/** Templated class implementation of NXDataSet. After loading the data it can
* be accessed via operators () and [].
-*/
+ */
template <class T> class NXDataSetTyped : public NXDataSet {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the dataset.
- * @param name :: The name of the dataset relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the dataset.
+ * @param name :: The name of the dataset relative to its parent
+ */
NXDataSetTyped(const NXClass &parent, const std::string &name)
: NXDataSet(parent, name), m_n(0) {}
/** Returns a pointer to the internal data buffer.
- * @throw runtime_error exception if the data have not been loaded /
- * initialized.
- * @return a pointer to the array of items
- */
+ * @throw runtime_error exception if the data have not been loaded /
+ * initialized.
+ * @return a pointer to the array of items
+ */
T *operator()() const {
if (!m_data)
throw std::runtime_error("Attempt to read uninitialized data from " +
@@ -236,11 +235,11 @@ public:
return m_data.get();
}
/** Returns the i-th value in the internal buffer
- * @param i :: The linear index of the data element
- * @throw runtime_error if the data have not been loaded / initialized.
- * @throw range_error if the index is greater than the buffer size.
- * @return A reference to the value
- */
+ * @param i :: The linear index of the data element
+ * @throw runtime_error if the data have not been loaded / initialized.
+ * @throw range_error if the index is greater than the buffer size.
+ * @return A reference to the value
+ */
T &operator[](int i) const {
if (!m_data)
throw std::runtime_error("Attempt to read uninitialized data from " +
@@ -250,21 +249,21 @@ public:
return m_data[i];
}
/** Returns a value assuming the data is a two-dimensional array
- * @param i :: The index along dim0()
- * @param j :: The index along dim1()
- * @throw runtime_error if the data have not been loaded / initialized.
- * @throw range_error if the indeces point outside the buffer.
- * @return A reference to the value
- */
- T &operator()(int i, int j) const { return this->operator[](i * dim1() + j); }
+ * @param i :: The index along dim0()
+ * @param j :: The index along dim1()
+ * @throw runtime_error if the data have not been loaded / initialized.
+ * @throw range_error if the indeces point outside the buffer.
+ * @return A reference to the value
+ */
+ T &operator()(int i, int j) const { return this->operator[](i *dim1() + j); }
/** Returns a value assuming the data is a tree-dimensional array
- * @param i :: The index along dim0()
- * @param j :: The index along dim1()
- * @param k :: The index along dim2()
- * @throw runtime_error if the data have not been loaded / initialized.
- * @throw range_error if the indeces point outside the buffer.
- * @return A reference to the value
- */
+ * @param i :: The index along dim0()
+ * @param j :: The index along dim1()
+ * @param k :: The index along dim2()
+ * @throw runtime_error if the data have not been loaded / initialized.
+ * @throw range_error if the indeces point outside the buffer.
+ * @return A reference to the value
+ */
T &operator()(int i, int j, int k) const {
return this->operator[]((i * dim1() + j) * dim2() + k);
}
@@ -273,26 +272,26 @@ public:
/// Returns the size of the data buffer
int size() const { return m_n; }
/** Implementation of the virtual NXDataSet::load(...) method. Internally the
- * data are stored as a 1d array.
- * If the data are loaded in chunks the newly read in data replace the old
- * ones. The actual rank of the loaded
- * data is equal or less than the rank of the dataset (returned by rank()
- * method).
- * @param blocksize :: The size of the block of data that should be read.
- * Note that this is only used for rank 2 and 3 datasets currently
- * @param i :: Calling load with non-negative i reads in a chunk of dimension
- * rank()-1 and i is the index
- * of the chunk. The rank of the data must be >= 1
- * @param j :: Non-negative value makes it read a chunk of dimension
- * rank()-2. i and j are its indeces.
- * The rank of the data must be >= 2
- * @param k :: Non-negative value makes it read a chunk of dimension
- * rank()-3. i,j and k are its indeces.
- * The rank of the data must be >= 3
- * @param l :: Non-negative value makes it read a chunk of dimension
- * rank()-4. i,j,k and l are its indeces.
- * The rank of the data must be 4
- */
+ * data are stored as a 1d array.
+ * If the data are loaded in chunks the newly read in data replace the old
+ * ones. The actual rank of the loaded
+ * data is equal or less than the rank of the dataset (returned by rank()
+ * method).
+ * @param blocksize :: The size of the block of data that should be read.
+ * Note that this is only used for rank 2 and 3 datasets currently
+ * @param i :: Calling load with non-negative i reads in a chunk of
+ * dimension rank()-1 and i is the index of the chunk. The rank of the data
+ * must be >= 1
+ * @param j :: Non-negative value makes it read a chunk of dimension
+ * rank()-2. i and j are its indeces.
+ * The rank of the data must be >= 2
+ * @param k :: Non-negative value makes it read a chunk of dimension
+ * rank()-3. i,j and k are its indeces.
+ * The rank of the data must be >= 3
+ * @param l :: Non-negative value makes it read a chunk of dimension
+ * rank()-4. i,j,k and l are its indeces.
+ * The rank of the data must be 4
+ */
void load(const int blocksize = 1, int i = -1, int j = -1, int k = -1,
int l = -1) override {
if (rank() > 4) {
@@ -442,8 +441,8 @@ public:
private:
/** Allocates memory for the data buffer
- * @param n :: The number of elements to allocate.
- */
+ * @param n :: The number of elements to allocate.
+ */
void alloc(int n) {
if (n <= 0) {
throw std::runtime_error("Attempt to load from an empty dataset " +
@@ -486,47 +485,47 @@ typedef NXDataSetTyped<unsigned int> NXUInt;
//-------------------- classes --------------------------//
/** The base class for a Nexus class (group). A Nexus class can contain
-* datasets and other Nexus classes.
-* The NeXus file format (www.nexusformat.org) specifies the content of the
-* Nexus classes.
-* Derived classes have specialized methods for creating classes and datasets
-* specific for the particular Nexus class.
-* NXClass is a conctrete C++ class so arbitrary, non-standard Nexus classes
-* (groups) can be created and loaded from
-* NeXus files.
-*/
+ * datasets and other Nexus classes.
+ * The NeXus file format (www.nexusformat.org) specifies the content of the
+ * Nexus classes.
+ * Derived classes have specialized methods for creating classes and datasets
+ * specific for the particular Nexus class.
+ * NXClass is a conctrete C++ class so arbitrary, non-standard Nexus classes
+ * (groups) can be created and loaded from
+ * NeXus files.
+ */
class DLLExport NXClass : public NXObject {
friend class NXRoot;
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXClass(const NXClass &parent, const std::string &name);
/// The NX class identifier
std::string NX_class() const override { return "NXClass"; }
/** Returns the class information about the next entry (class or dataset) in
* this class.
- */
+ */
NXClassInfo getNextEntry();
/// Creates a new object in the NeXus file at path path.
// virtual void make(const std::string& path) = 0;
/// Resets the current position for getNextEntry() to the beginning
void reset();
/**
- * Check if a path exists relative to the current class path
- * @param path :: A string representing the path to test
- * @return True if it is valid
- */
+ * Check if a path exists relative to the current class path
+ * @param path :: A string representing the path to test
+ * @return True if it is valid
+ */
bool isValid(const std::string &path) const;
/** Templated method for creating derived NX classes. It also opens the
- * created class.
- * @param name :: The name of the class
- * @tparam NX Concrete Nexus class
- * @return The new object
- */
+ * created class.
+ * @param name :: The name of the class
+ * @tparam NX Concrete Nexus class
+ * @return The new object
+ */
template <class NX> NX openNXClass(const std::string &name) const {
NX nxc(*this, name);
nxc.open();
@@ -534,18 +533,18 @@ public:
}
/** Creates and opens an arbitrary (non-standard) class (group).
- * @param name :: The name of the class.
- * @return The opened NXClass
- */
+ * @param name :: The name of the class.
+ * @return The opened NXClass
+ */
NXClass openNXGroup(const std::string &name) const {
return openNXClass<NXClass>(name);
}
/** Templated method for creating datasets. It also opens the created set.
- * @param name :: The name of the dataset
- * @tparam T The type of the data (int, double, ...).
- * @return The new object
- */
+ * @param name :: The name of the dataset
+ * @tparam T The type of the data (int, double, ...).
+ * @return The new object
+ */
template <class T>
NXDataSetTyped<T> openNXDataSet(const std::string &name) const {
NXDataSetTyped<T> data(*this, name);
@@ -554,59 +553,59 @@ public:
}
/** Creates and opens an integer dataset
- * @param name :: The name of the dataset
- * @return The int
- */
+ * @param name :: The name of the dataset
+ * @return The int
+ */
NXInt openNXInt(const std::string &name) const {
return openNXDataSet<int>(name);
}
/** Creates and opens a float dataset
- * @param name :: The name of the dataset
- * @return The float
- */
+ * @param name :: The name of the dataset
+ * @return The float
+ */
NXFloat openNXFloat(const std::string &name) const {
return openNXDataSet<float>(name);
}
/** Creates and opens a double dataset
- * @param name :: The name of the dataset
- * @return The double
- */
+ * @param name :: The name of the dataset
+ * @return The double
+ */
NXDouble openNXDouble(const std::string &name) const {
return openNXDataSet<double>(name);
}
/** Creates and opens a char dataset
- * @param name :: The name of the dataset
- * @return The char
- */
+ * @param name :: The name of the dataset
+ * @return The char
+ */
NXChar openNXChar(const std::string &name) const {
return openNXDataSet<char>(name);
}
/** Creates and opens a size_t dataset
- * @param name :: The name of the dataset
- * @return The size_t
- */
+ * @param name :: The name of the dataset
+ * @return The size_t
+ */
NXSize openNXSize(const std::string &name) const {
return openNXDataSet<std::size_t>(name);
}
/** Returns a string
- * @param name :: The name of the NXChar dataset
- * @return The string
- */
+ * @param name :: The name of the NXChar dataset
+ * @return The string
+ */
std::string getString(const std::string &name) const;
/** Returns a double
- * @param name :: The name of the NXDouble dataset
- * @return The double
- */
+ * @param name :: The name of the NXDouble dataset
+ * @return The double
+ */
double getDouble(const std::string &name) const;
/** Returns a float
- * @param name :: The name of the NXFloat dataset
- * @return The float
- */
+ * @param name :: The name of the NXFloat dataset
+ * @return The float
+ */
float getFloat(const std::string &name) const;
/** Returns a int
- * @param name :: The name of the NXInt dataset
- * @return The int
- */
+ * @param name :: The name of the NXInt dataset
+ * @return The int
+ */
int getInt(const std::string &name) const;
/// Returns a list of all classes (or groups) in this NXClass
@@ -616,9 +615,9 @@ public:
/// Returns a list of all datasets in this NXClass
std::vector<NXInfo> &datasets() const { return *m_datasets; }
/** Returns NXInfo for a dataset
- * @param name :: The name of the dataset
- * @return NXInfo::stat is set to NX_ERROR if the dataset does not exist
- */
+ * @param name :: The name of the dataset
+ * @return NXInfo::stat is set to NX_ERROR if the dataset does not exist
+ */
NXInfo getDataSetInfo(const std::string &name) const;
/// Returns whether an individual dataset is present
bool containsDataSet(const std::string &query) const;
@@ -651,14 +650,14 @@ private:
//------------------- auxiliary classes ----------------------------//
/** Implements NXlog Nexus class.
-*/
+ */
class DLLExport NXLog : public NXClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXLog(const NXClass &parent, const std::string &name)
: NXClass(parent, name) {}
/// Nexus class id
@@ -740,7 +739,7 @@ private:
///@returns a property pointer
template <class NX_TYPE, class TIME_TYPE>
Kernel::Property *loadValues(const std::string &logName, NX_TYPE &value,
- Kernel::DateAndTime start_t,
+ Mantid::Types::DateAndTime start_t,
const TIME_TYPE ×) {
value.openLocal();
auto logv = new Kernel::TimeSeriesProperty<double>(logName);
@@ -756,14 +755,14 @@ private:
};
/** Implements NXnote Nexus class.
-*/
+ */
class DLLExport NXNote : public NXClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXNote(const NXClass &parent, const std::string &name)
: NXClass(parent, name), m_author_ok(), m_data_ok(), m_description_ok() {}
/// Nexus class id
@@ -785,14 +784,14 @@ protected:
};
/** Implements NXnote Nexus class with binary data.
-*/
+ */
class DLLExport NXBinary : public NXNote {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXBinary(const NXClass &parent, const std::string &name)
: NXNote(parent, name) {}
/// Return the binary data associated with the note
@@ -805,44 +804,44 @@ private:
//-------------------- main classes -------------------------------//
/** Main class is the one that can contain auxiliary classes.
-*/
+ */
class DLLExport NXMainClass : public NXClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXMainClass(const NXClass &parent, const std::string &name)
: NXClass(parent, name) {}
/** Opens a NXLog class
- * @param name :: The name of the NXLog
- * @return The log
- */
+ * @param name :: The name of the NXLog
+ * @return The log
+ */
NXLog openNXLog(const std::string &name) { return openNXClass<NXLog>(name); }
/** Opens a NXNote class
- * @param name :: The name of the NXNote
- * @return The note
- */
+ * @param name :: The name of the NXNote
+ * @return The note
+ */
NXNote openNXNote(const std::string &name) {
return openNXClass<NXNote>(name);
}
};
/** Implements NXdata Nexus class.
-*/
+ */
class DLLExport NXData : public NXMainClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXData(const NXClass &parent, const std::string &name);
/// Nexus class id
std::string NX_class() const override { return "NXdata"; }
/** Opens the dataset within this NXData with signal=1 attribute.
- */
+ */
template <typename T> NXDataSetTyped<T> openData() {
for (std::vector<NXInfo>::const_iterator it = datasets().begin();
it != datasets().end(); it++) {
@@ -873,14 +872,14 @@ public:
};
/** Implements NXdetector Nexus class.
-*/
+ */
class DLLExport NXDetector : public NXMainClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXDetector(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
@@ -894,14 +893,14 @@ public:
};
/** Implements NXdisk_chopper Nexus class.
-*/
+ */
class DLLExport NXDiskChopper : public NXMainClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXDiskChopper(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
@@ -911,66 +910,66 @@ public:
};
/** Implements NXinstrument Nexus class.
-*/
+ */
class DLLExport NXInstrument : public NXMainClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXInstrument(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
std::string NX_class() const override { return "NXinstrument"; }
/** Opens a NXDetector
- * @param name :: The name of the class
- * @return The detector
- */
+ * @param name :: The name of the class
+ * @return The detector
+ */
NXDetector openNXDetector(const std::string &name) {
return openNXClass<NXDetector>(name);
}
/** Opens a NXDetector
- * @param name :: The name of the class
- * @return The detector
- */
+ * @param name :: The name of the class
+ * @return The detector
+ */
NXDiskChopper openNXDiskChopper(const std::string &name) {
return openNXClass<NXDiskChopper>(name);
}
};
/** Implements NXentry Nexus class.
-*/
+ */
class DLLExport NXEntry : public NXMainClass {
public:
/** Constructor.
- * @param parent :: The parent Nexus class. In terms of HDF it is the group
- * containing the NXClass.
- * @param name :: The name of the NXClass relative to its parent
- */
+ * @param parent :: The parent Nexus class. In terms of HDF it is the group
+ * containing the NXClass.
+ * @param name :: The name of the NXClass relative to its parent
+ */
NXEntry(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
std::string NX_class() const override { return "NXentry"; }
/** Opens a NXData
- * @param name :: The name of the class
- * @return the nxdata entry
- */
+ * @param name :: The name of the class
+ * @return the nxdata entry
+ */
NXData openNXData(const std::string &name) {
return openNXClass<NXData>(name);
}
/** Opens a NXInstrument
- * @param name :: The name of the class
- * @return the instrument
- */
+ * @param name :: The name of the class
+ * @return the instrument
+ */
NXInstrument openNXInstrument(const std::string &name) {
return openNXClass<NXInstrument>(name);
}
};
/** Implements NXroot Nexus class.
-*/
+ */
class DLLExport NXRoot : public NXClass {
public:
// Constructor
@@ -985,9 +984,9 @@ public:
/// definition.
bool isStandard() const;
/** Opens an entry -- a topmost Nexus class
- * @param name :: The name of the entry
- * @return the entry
- */
+ * @param name :: The name of the entry
+ * @return the entry
+ */
NXEntry openEntry(const std::string &name) {
return openNXClass<NXEntry>(name);
}
diff --git a/Framework/Nexus/inc/MantidNexus/NexusFileIO.h b/Framework/Nexus/inc/MantidNexus/NexusFileIO.h
index 9a80710ff09efa5ccb79f79b27513e8f0a5b7843..1ebb0140580ec7840bce44c7be63451d6fabc126 100644
--- a/Framework/Nexus/inc/MantidNexus/NexusFileIO.h
+++ b/Framework/Nexus/inc/MantidNexus/NexusFileIO.h
@@ -387,22 +387,22 @@ void NexusFileIO::writeNumericTimeLog(
if (ipos != std::string::npos)
logName = logName.substr(ipos + 1);
// extract values from timeseries
- std::map<Kernel::DateAndTime, T> dV = timeSeries->valueAsMap();
+ std::map<Mantid::Types::DateAndTime, T> dV = timeSeries->valueAsMap();
std::vector<double> values;
std::vector<double> times;
- Kernel::DateAndTime t0;
+ Mantid::Types::DateAndTime t0;
bool first = true;
- for (typename std::map<Kernel::DateAndTime, T>::const_iterator dv =
+ for (typename std::map<Mantid::Types::DateAndTime, T>::const_iterator dv =
dV.begin();
dv != dV.end(); dv++) {
T val = dv->second;
- Kernel::DateAndTime time = dv->first;
+ Mantid::Types::DateAndTime time = dv->first;
values.push_back(val);
if (first) {
t0 = time; // start time of log
first = false;
}
- times.push_back(Kernel::DateAndTime::secondsFromDuration(time - t0));
+ times.push_back(Mantid::Types::DateAndTime::secondsFromDuration(time - t0));
}
// create log
status = NXmakegroup(fileID, logName.c_str(), "NXlog");
diff --git a/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Framework/PythonInterface/mantid/api/CMakeLists.txt
index c1a7146b29db548f74f3ade9a3bde4ab0eb95e08..4b074d1dc9a537bbffabcaa9ccc1978c76f3923c 100644
--- a/Framework/PythonInterface/mantid/api/CMakeLists.txt
+++ b/Framework/PythonInterface/mantid/api/CMakeLists.txt
@@ -144,6 +144,7 @@ target_link_libraries ( PythonAPIModule LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTI
PythonGeometryModule
PythonKernelModule
API
+ Types
Kernel
HistogramData
Geometry
diff --git a/Framework/PythonInterface/mantid/dataobjects/CMakeLists.txt b/Framework/PythonInterface/mantid/dataobjects/CMakeLists.txt
index c7c1d77df86ccc388ac54a2dbafb07e6f87f3c2f..0f444730bc535e92671da6b7c1b6c9318e22f2c6 100644
--- a/Framework/PythonInterface/mantid/dataobjects/CMakeLists.txt
+++ b/Framework/PythonInterface/mantid/dataobjects/CMakeLists.txt
@@ -71,6 +71,7 @@ target_link_libraries ( PythonDataObjectsModule LINK_PRIVATE ${TCMALLOC_LIBRARIE
PythonKernelModule
API
DataObjects
+ Types
Kernel
HistogramData
Geometry
diff --git a/Framework/PythonInterface/mantid/dataobjects/src/Exports/EventList.cpp b/Framework/PythonInterface/mantid/dataobjects/src/Exports/EventList.cpp
index c774b1e81856405b0d805a93fd848d772f7d33a7..eacc63c5efaba753c69d5ce1b3ced823032aa006 100644
--- a/Framework/PythonInterface/mantid/dataobjects/src/Exports/EventList.cpp
+++ b/Framework/PythonInterface/mantid/dataobjects/src/Exports/EventList.cpp
@@ -10,7 +10,7 @@ GET_POINTER_SPECIALIZATION(EventList)
namespace {
void addEventToEventList(EventList &self, double tof,
- Mantid::Kernel::DateAndTime pulsetime) {
+ Mantid::Types::DateAndTime pulsetime) {
self.addEventQuickly(Mantid::DataObjects::TofEvent(tof, pulsetime));
}
}
diff --git a/Framework/PythonInterface/mantid/geometry/CMakeLists.txt b/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
index a05a9c2d6f0634f4a4b2e9ee280b91c383704c3d..269d249777cc788468ee7fe2f62541d5926435b5 100644
--- a/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
+++ b/Framework/PythonInterface/mantid/geometry/CMakeLists.txt
@@ -83,6 +83,7 @@ target_link_libraries ( PythonGeometryModule LINK_PRIVATE ${TCMALLOC_LIBRARIES_L
PythonKernelModule
Geometry
Beamline
+ Types
Kernel
${PYTHON_LIBRARIES}
${POCO_LIBRARIES}
diff --git a/Framework/PythonInterface/mantid/kernel/CMakeLists.txt b/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
index d74bf35cac179ee078a783b9055911dbe34ba9c0..9d7ca816920248970d2f1400c9d24cea44a366ed 100644
--- a/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
+++ b/Framework/PythonInterface/mantid/kernel/CMakeLists.txt
@@ -188,7 +188,7 @@ add_library ( PythonKernelModule ${EXPORT_FILES} ${MODULE_DEFINITION} ${SRC_FILE
set_python_properties( PythonKernelModule _kernel )
set_target_output_directory ( PythonKernelModule ${OUTPUT_DIR} .pyd )
# Add the required dependencies
-target_link_libraries ( PythonKernelModule LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} Kernel ${Boost_LIBRARIES}
+target_link_libraries ( PythonKernelModule LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} Types Kernel ${Boost_LIBRARIES}
${PYTHON_LIBRARIES} ${PYTHON_DEPS} ${POCO_LIBRARIES} ${TBB_LIBRARIES}
${TBB_MALLOC_LIBRARIES} )
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
index 4928393000b1b61d19e99d649308dca8a408f8f2..b909575bcb8875602ed297c8beedfdeee8ffe30a 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
@@ -1,9 +1,11 @@
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
+#include <MantidKernel/DateAndTimeHelpers.h>
#include <boost/python/class.hpp>
+#include <boost/python/make_constructor.hpp>
#include <boost/python/operators.hpp> // Also provides self
-using Mantid::Kernel::DateAndTime;
-using Mantid::Kernel::time_duration;
+using Mantid::Types::DateAndTime;
+using Mantid::Types::time_duration;
using namespace boost::python;
using boost::python::arg;
@@ -17,11 +19,14 @@ std::string ISO8601StringPlusSpace(DateAndTime &self) {
return self.toISO8601String() + " ";
}
+void createFromISO8601(DateAndTime &self, const std::string &date) {
+ self = Mantid::Types::DateAndTimeHelpers::createFromISO8601(date);
+}
+
void export_DateAndTime() {
class_<DateAndTime>("DateAndTime", no_init)
// Constructors
- .def(init<const std::string>((arg("self"), arg("ISO8601 string")),
- "Construct from an ISO8601 string"))
+ .def("__init__", make_constructor(&createFromISO8601))
.def(init<double, double>(
(arg("self"), arg("seconds"), arg("nanoseconds")),
"Construct using a number of seconds and nanoseconds (floats)"))
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp
index 79cae97c59bbdd1f9fd72cf2339a8346ef740907..7d9fe1af17c82cdac7356028c52f03a70375c1b7 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp
@@ -1,6 +1,6 @@
#include "MantidPythonInterface/kernel/StlExportDefinitions.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Quat.h"
#include "MantidKernel/V3D.h"
@@ -16,7 +16,7 @@ void exportStlContainers() {
std_vector_exporter<double>::wrap("std_vector_dbl");
std_vector_exporter<bool>::wrap("std_vector_bool");
std_vector_exporter<std::string>::wrap("std_vector_str");
- std_vector_exporter<Mantid::Kernel::DateAndTime>::wrap(
+ std_vector_exporter<Mantid::Types::DateAndTime>::wrap(
"std_vector_dateandtime");
std_vector_exporter<Mantid::Kernel::Quat>::wrap("std_vector_quat");
std_vector_exporter<Mantid::Kernel::V3D>::wrap("std_vector_v3d");
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
index 85ec086789f9e3e97ae1ee4c346445ad2a99668f..1bf09100f648eed58388ab3df28470169a022d53 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
@@ -9,7 +9,7 @@
#include <boost/python/return_value_policy.hpp>
#include <boost/python/register_ptr_to_python.hpp>
-using Mantid::Kernel::DateAndTime;
+using Mantid::Types::DateAndTime;
using Mantid::Kernel::TimeSeriesProperty;
using Mantid::Kernel::Property;
using namespace boost::python;
diff --git a/Framework/PythonInterface/test/cpp/CMakeLists.txt b/Framework/PythonInterface/test/cpp/CMakeLists.txt
index ac77fec315c8b37c4fb3b8bfab6bdad52c4b7b5e..43f0992caf109c0360f8a4b4a336347565cd342b 100644
--- a/Framework/PythonInterface/test/cpp/CMakeLists.txt
+++ b/Framework/PythonInterface/test/cpp/CMakeLists.txt
@@ -18,6 +18,7 @@ if ( CXXTEST_FOUND )
target_link_libraries( PythonInterfaceCppTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
API
Geometry
+ Types
Kernel
PythonKernelModule
PythonAPIModule
diff --git a/Framework/PythonInterface/test/testhelpers/CMakeLists.txt b/Framework/PythonInterface/test/testhelpers/CMakeLists.txt
index 9b4bbb3997011c639e06e7aaf600138085e15deb..0a918e2189e6ee72c781161b381b03e029b6e84f 100644
--- a/Framework/PythonInterface/test/testhelpers/CMakeLists.txt
+++ b/Framework/PythonInterface/test/testhelpers/CMakeLists.txt
@@ -42,6 +42,7 @@ target_link_libraries ( PythonWorkspaceCreationHelper LINK_PRIVATE ${TCMALLOC_LI
DataHandling
API
HistogramData
+ Types
Kernel
Geometry
${PYTHON_LIBRARIES}
diff --git a/Framework/RemoteJobManagers/src/MantidWebServiceAPIJobManager.cpp b/Framework/RemoteJobManagers/src/MantidWebServiceAPIJobManager.cpp
index beb5de2fe487c257d36d7f2de6d0dc2562670300..3d00162e92238be905d2d3912879428d457dd669 100644
--- a/Framework/RemoteJobManagers/src/MantidWebServiceAPIJobManager.cpp
+++ b/Framework/RemoteJobManagers/src/MantidWebServiceAPIJobManager.cpp
@@ -1,7 +1,8 @@
+#include "MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h"
#include "MantidAPI/RemoteJobManagerFactory.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Logger.h"
#include "MantidRemoteJobManagers/MantidWebServiceAPIHelper.h"
-#include "MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h"
#include "MantidRemoteJobManagers/SimpleJSON.h"
#include <fstream>
@@ -15,7 +16,7 @@ DECLARE_REMOTEJOBMANAGER(MantidWebServiceAPIJobManager)
namespace {
// static logger object
Mantid::Kernel::Logger g_log("MantidWebServiceAPIJobManager");
-}
+} // namespace
using namespace Mantid::Kernel;
@@ -100,8 +101,8 @@ void MantidWebServiceAPIJobManager::downloadRemoteFile(
const std::string &localFileName) {
std::istream &respStream =
- httpGet("/download", std::string("TransID=") + transactionID + "&File=" +
- remoteFileName);
+ httpGet("/download", std::string("TransID=") + transactionID +
+ "&File=" + remoteFileName);
if (lastStatus() == Poco::Net::HTTPResponse::HTTP_OK) {
@@ -221,9 +222,12 @@ MantidWebServiceAPIJobManager::queryAllRemoteJobs() const {
info.name = jobNames[i];
info.runnableName = scriptNames[i];
info.transactionID = transIds[i];
- info.submitDate = DateAndTime(submitDates[i]);
- info.startDate = DateAndTime(startDates[i]);
- info.completionTime = DateAndTime(completionDates[i]);
+ info.submitDate =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(submitDates[i]);
+ info.startDate =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(startDates[i]);
+ info.completionTime = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ completionDates[i]);
info.cmdLine = cmdLines[i];
result.push_back(info);
}
@@ -318,13 +322,16 @@ MantidWebServiceAPIJobManager::queryRemoteJob(const std::string &jobID) const {
// in the output and see if the values are there...
if (status.find("SubmitDate") != status.end()) {
status["SubmitDate"].getValue(value);
- info.submitDate = DateAndTime(value);
+ info.submitDate =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(value);
status["StartDate"].getValue(value);
- info.startDate = DateAndTime(value);
+ info.startDate =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(value);
status["CompletionDate"].getValue(value);
- info.completionTime = DateAndTime(value);
+ info.completionTime =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601(value);
}
// in principle not required for/provided by the Mantid remote job submission
diff --git a/Framework/RemoteJobManagers/test/CMakeLists.txt b/Framework/RemoteJobManagers/test/CMakeLists.txt
index f6c492b9623cf023ebede3d7e2e322eec4a26635..8265c26935123e56736e842d4444bef6470e7ca4 100644
--- a/Framework/RemoteJobManagers/test/CMakeLists.txt
+++ b/Framework/RemoteJobManagers/test/CMakeLists.txt
@@ -4,6 +4,7 @@ if ( CXXTEST_FOUND )
cxxtest_add_test ( RemoteJobManagersTest ${TEST_FILES} )
target_link_libraries ( RemoteJobManagersTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
API
+ Types
Kernel
RemoteJobManagers
${Boost_LIBRARIES}
diff --git a/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h b/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h
index 3dd4a670c06dafe42aadfb1e4d2135bde7c541af..2abbd55cec768e81bc7ded7eaab02be9b72da607 100644
--- a/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h
+++ b/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h
@@ -48,8 +48,8 @@ public:
bool buffersEvents() const override { return false; }
bool connect(const Poco::Net::SocketAddress &address) override;
- void start(Mantid::Kernel::DateAndTime startTime =
- Mantid::Kernel::DateAndTime()) override;
+ void start(Mantid::Types::DateAndTime startTime =
+ Mantid::Types::DateAndTime()) override;
boost::shared_ptr<Mantid::API::Workspace> extractData() override;
bool isConnected() override;
ILiveListener::RunStatus runStatus() override;
diff --git a/Framework/SINQ/src/SINQHMListener.cpp b/Framework/SINQ/src/SINQHMListener.cpp
index 183e3e37e72f501210d3adcbf0cf10adabf399ae..741e8b892e4ec28e81cadc435d6f0f985d90a608 100644
--- a/Framework/SINQ/src/SINQHMListener.cpp
+++ b/Framework/SINQ/src/SINQHMListener.cpp
@@ -123,7 +123,7 @@ void SINQHMListener::setSpectra(
*/
}
-void SINQHMListener::start(Mantid::Kernel::DateAndTime /*startTime */) {
+void SINQHMListener::start(Mantid::Types::DateAndTime /*startTime */) {
// Nothing to do here
}
diff --git a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
index 696d84d641353076bf3bec1d88e5341e41b274f3..e5bb325432aa97766381542225ea652824774171 100644
--- a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
+++ b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
@@ -2,10 +2,11 @@
#define _MANTIDSCRIPTREPOSITORY_SCRIPTREPOSITORYIMPL_H_
#include "MantidAPI/ScriptRepository.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidScriptRepository/DllConfig.h"
-#include <map>
+#include "MantidTypes/DateAndTime.h"
#include <json/value.h>
+#include <map>
namespace Mantid {
namespace API {
@@ -44,17 +45,17 @@ class SCRIPT_DLL_EXPORT ScriptRepositoryImpl : public ScriptRepository {
/// For the local files, get the DateAndTime reported by the operative
/// system
/// or defaultTime if not available.
- Kernel::DateAndTime current_date;
+ Mantid::Types::DateAndTime current_date;
/// For the files that were downloaded, get the DateAndTime reported when
/// they
/// were created.
- Kernel::DateAndTime downloaded_date;
+ Mantid::Types::DateAndTime downloaded_date;
/// For the remote files, get the DateAndTime of the last revision.
- Kernel::DateAndTime pub_date;
+ Mantid::Types::DateAndTime pub_date;
/// Description of the files.
std::string description;
/// The version downloaded of this file
- Kernel::DateAndTime downloaded_pubdate;
+ Mantid::Types::DateAndTime downloaded_pubdate;
/// Indicate if this file should be updated automatically.
bool auto_update;
/// Identify the author of this file.
@@ -64,10 +65,11 @@ class SCRIPT_DLL_EXPORT ScriptRepositoryImpl : public ScriptRepository {
/// provide a constructor, to set the default values.
RepositoryEntry()
: remote(false), local(false), directory(false),
- current_date(Kernel::DateAndTime::defaultTime()),
- downloaded_date(Kernel::DateAndTime::defaultTime()),
- pub_date(Kernel::DateAndTime::defaultTime()), description(""),
- downloaded_pubdate(Kernel::DateAndTime::defaultTime()),
+ current_date(Mantid::Types::DateAndTimeHelpers::defaultTime()),
+ downloaded_date(Mantid::Types::DateAndTimeHelpers::defaultTime()),
+ pub_date(Mantid::Types::DateAndTimeHelpers::defaultTime()),
+ description(""),
+ downloaded_pubdate(Mantid::Types::DateAndTimeHelpers::defaultTime()),
auto_update(false), author(""), status(BOTH_UNCHANGED){};
};
diff --git a/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp b/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
index e06f2da0426e1509b75454ba941b77b6a63cf964..b2d847a63e6ed94d9c870261dc0ef0c6ed7022f1 100644
--- a/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
+++ b/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
@@ -2,34 +2,35 @@
#include "MantidScriptRepository/ScriptRepositoryImpl.h"
#include "MantidAPI/ScriptRepositoryFactory.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/InternetHelper.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/NetworkProxy.h"
#include "MantidKernel/ProxyInfo.h"
-#include <utility>
#include <unordered_set>
+#include <utility>
-using Mantid::Kernel::DateAndTime;
-using Mantid::Kernel::Logger;
+using namespace Mantid::Types;
using Mantid::Kernel::ConfigService;
using Mantid::Kernel::ConfigServiceImpl;
-using Mantid::Kernel::ProxyInfo;
+using Mantid::Kernel::Logger;
using Mantid::Kernel::NetworkProxy;
+using Mantid::Kernel::ProxyInfo;
// from poco
-#include <Poco/Path.h>
+#include <Poco/Exception.h>
#include <Poco/File.h>
+#include <Poco/Net/NetException.h>
+#include <Poco/Path.h>
#include <Poco/TemporaryFile.h>
#include <Poco/URI.h>
-#include <Poco/Exception.h>
-#include <Poco/Net/NetException.h>
/*#include <Poco/Net/HTTPClientSession.h>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Net/HTTPResponse.h>
*/
-#include <Poco/Net/HTMLForm.h>
#include "Poco/Net/FilePartSource.h"
+#include <Poco/Net/HTMLForm.h>
// Visual Studio complains with the inclusion of Poco/FileStream
// disabling this warning.
@@ -45,13 +46,14 @@ using Mantid::Kernel::NetworkProxy;
#include <Poco/NullStream.h>
#include <cstdlib>
#endif
-#include <Poco/StreamCopier.h>
-#include <Poco/DirectoryIterator.h>
-#include <Poco/DateTimeParser.h>
#include <Poco/DateTimeFormatter.h>
+#include <Poco/DateTimeParser.h>
+#include <Poco/DirectoryIterator.h>
+#include <Poco/StreamCopier.h>
// from boost
#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
#include <boost/regex.hpp>
#include <json/json.h>
@@ -61,7 +63,7 @@ namespace API {
namespace {
/// static logger
Kernel::Logger g_log("ScriptRepositoryImpl");
-}
+} // namespace
/// Default timeout
int DEFAULT_TIMEOUT_SEC = 30;
@@ -361,7 +363,8 @@ void ScriptRepositoryImpl::ensureValidRepository() {
if (!isValid()) {
std::stringstream ss;
ss << "ScriptRepository is not installed correctly. The current path for "
- "ScriptRepository is " << local_repository
+ "ScriptRepository is "
+ << local_repository
<< " but some important files that are required are corrupted or not "
"present."
<< "\nPlease, re-install the ScriptRepository!\n"
@@ -463,11 +466,12 @@ std::vector<std::string> ScriptRepositoryImpl::listFiles() {
// it will proceed in this situation.
} catch (Poco::Exception &ex) {
g_log.error() << "ScriptRepository failed to list all entries inside the "
- "repository. Details: " << ex.className() << ":> "
- << ex.displayText() << '\n';
+ "repository. Details: "
+ << ex.className() << ":> " << ex.displayText() << '\n';
} catch (std::exception &ex) {
g_log.error() << "ScriptRepository failed to list all entries inside the "
- "repository. Details: " << ex.what() << '\n';
+ "repository. Details: "
+ << ex.what() << '\n';
}
std::vector<std::string> out(repo.size());
size_t i = repo.size();
@@ -654,7 +658,7 @@ void ScriptRepositoryImpl::download_directory(
dir.createDirectories();
entry.second.status = BOTH_UNCHANGED;
- entry.second.downloaded_date = DateAndTime(
+ entry.second.downloaded_date = DateAndTimeHelpers::createFromISO8601(
Poco::DateTimeFormatter::format(dir.getLastModified(), timeformat));
entry.second.downloaded_pubdate = entry.second.pub_date;
updateLocalJson(entry.first, entry.second);
@@ -738,7 +742,7 @@ void ScriptRepositoryImpl::download_file(const std::string &file_path,
{
Poco::File local(local_path);
- entry.downloaded_date = DateAndTime(
+ entry.downloaded_date = DateAndTimeHelpers::createFromISO8601(
Poco::DateTimeFormatter::format(local.getLastModified(), timeformat));
entry.downloaded_pubdate = entry.pub_date;
entry.status = BOTH_UNCHANGED;
@@ -889,13 +893,15 @@ void ScriptRepositoryImpl::upload(const std::string &file_path,
RepositoryEntry &entry = repo.at(file_path);
{
Poco::File local(absolute_path);
- entry.downloaded_date = DateAndTime(Poco::DateTimeFormatter::format(
- local.getLastModified(), timeformat));
+ entry.downloaded_date = DateAndTimeHelpers::createFromISO8601(
+ Poco::DateTimeFormatter::format(local.getLastModified(),
+ timeformat));
// update the pub_date and downloaded_pubdate with the pub_date given by
// the upload.
// this ensures that the status will be correctly defined.
if (!published_date.empty())
- entry.pub_date = DateAndTime(published_date);
+ entry.pub_date =
+ DateAndTimeHelpers::createFromISO8601(published_date);
entry.downloaded_pubdate = entry.pub_date;
entry.status = BOTH_UNCHANGED;
}
@@ -909,7 +915,8 @@ void ScriptRepositoryImpl::upload(const std::string &file_path,
// So add to the file locally to avoid race condition.
RepositoryEntry &remote_entry = repo.at(file_path);
if (!published_date.empty())
- remote_entry.pub_date = DateAndTime(published_date);
+ remote_entry.pub_date =
+ DateAndTimeHelpers::createFromISO8601(published_date);
remote_entry.status = BOTH_UNCHANGED;
g_log.debug() << "ScriptRepository updating repository json \n";
updateRepositoryJson(file_path, remote_entry);
@@ -923,14 +930,14 @@ void ScriptRepositoryImpl::upload(const std::string &file_path,
}
/*
-* Adds an entry to .repository.json
-* This is necessary when uploading a file to keep .repository.json and
-* .local.json in sync, and thus display correct file status in the GUI.
-* Requesting an updated .repository.json from the server is not viable
-* at such a time as it would create a race condition.
-* @param path: relative path of uploaded file
-* @param entry: the entry to add to the json file
-*/
+ * Adds an entry to .repository.json
+ * This is necessary when uploading a file to keep .repository.json and
+ * .local.json in sync, and thus display correct file status in the GUI.
+ * Requesting an updated .repository.json from the server is not viable
+ * at such a time as it would create a race condition.
+ * @param path: relative path of uploaded file
+ * @param entry: the entry to add to the json file
+ */
void ScriptRepositoryImpl::updateRepositoryJson(const std::string &path,
const RepositoryEntry &entry) {
@@ -1432,7 +1439,8 @@ void ScriptRepositoryImpl::parseCentralRepository(Repository &repo) {
RepositoryEntry &entry = repo[filepath];
entry.remote = true;
entry.directory = entry_json.get("directory", false).asBool();
- entry.pub_date = DateAndTime(entry_json.get("pub_date", "").asString());
+ entry.pub_date = DateAndTimeHelpers::createFromISO8601(
+ entry_json.get("pub_date", "").asString());
entry.description = entry_json.get("description", "").asString();
entry.author = entry_json.get("author", "").asString();
entry.status = BOTH_UNCHANGED;
@@ -1501,9 +1509,11 @@ void ScriptRepositoryImpl::parseDownloadedEntries(Repository &repo) {
// was found at the local file system and at the remote repository
entry_it->second.downloaded_pubdate =
- DateAndTime(entry_json.get("downloaded_pubdate", "").asString());
+ DateAndTimeHelpers::createFromISO8601(
+ entry_json.get("downloaded_pubdate", "").asString());
entry_it->second.downloaded_date =
- DateAndTime(entry_json.get("downloaded_date", "").asString());
+ DateAndTimeHelpers::createFromISO8601(
+ entry_json.get("downloaded_date", "").asString());
std::string auto_update =
entry_json.get("auto_update", "false").asString();
entry_it->second.auto_update =
@@ -1649,7 +1659,7 @@ void ScriptRepositoryImpl::recursiveParsingDirectories(const std::string &path,
// '\n';
RepositoryEntry &entry = repo[entry_path];
entry.local = true;
- entry.current_date = DateAndTime(
+ entry.current_date = DateAndTimeHelpers::createFromISO8601(
Poco::DateTimeFormatter::format(it->getLastModified(), timeformat));
entry.directory = it->isDirectory();
if (it->isDirectory())
@@ -1764,6 +1774,6 @@ std::string ScriptRepositoryImpl::convertPath(const std::string &path) {
return path;
}
-} // END API
+} // namespace API
-} // END MANTID
+} // namespace Mantid
diff --git a/Framework/ScriptRepository/test/CMakeLists.txt b/Framework/ScriptRepository/test/CMakeLists.txt
index 07c02b4684923f47a2ed6c8da4358ffe03e9f51f..b9e32da9cf53236ba7f4172bcc325c13053fa716 100644
--- a/Framework/ScriptRepository/test/CMakeLists.txt
+++ b/Framework/ScriptRepository/test/CMakeLists.txt
@@ -7,6 +7,7 @@ if ( CXXTEST_FOUND )
cxxtest_add_test ( ScriptRepositoryTest ${TEST_FILES} ${GMOCK_TEST_FILES})
target_link_libraries( ScriptRepositoryTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
API
+ Types
Kernel
ScriptRepository
${Boost_LIBRARIES}
diff --git a/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h b/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
index 9c3ac2e2e5753eef60f5e6d2c511b4101fcd4b33..87bfde695579ec32211693558e5337e5c96478b4 100644
--- a/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
+++ b/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
@@ -1,10 +1,10 @@
#ifndef SCRIPTREPOSITORYIMPLTEST_H_
#define SCRIPTREPOSITORYIMPLTEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidScriptRepository/ScriptRepositoryImpl.h"
#include <Poco/File.h>
#include <Poco/Path.h>
+#include <cxxtest/TestSuite.h>
// Visual Studion compains with the inclusion of Poco/FileStream
// disabling this warning.
#if defined(_WIN32) || defined(_WIN64)
@@ -15,17 +15,19 @@
#else
#include <Poco/FileStream.h>
#endif
+#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include <Poco/DateTimeFormatter.h>
#include <Poco/TemporaryFile.h>
#include <algorithm>
-#include <Poco/DateTimeFormatter.h>
#include <boost/algorithm/string.hpp>
-#include "MantidKernel/ConfigService.h"
+
using Mantid::Kernel::ConfigService;
using Mantid::Kernel::ConfigServiceImpl;
-using Mantid::Kernel::DateAndTime;
+using namespace Mantid::Types;
using namespace std;
-using Mantid::API::ScriptRepositoryImpl;
using Mantid::API::ScriptRepoException;
+using Mantid::API::ScriptRepositoryImpl;
const bool TEST_MANUALLY = false;
@@ -391,8 +393,8 @@ public:
}
/*************************************
- * File Info
- *************************************/
+ * File Info
+ *************************************/
void test_info_correctly_parses_the_repository_json() {
using Mantid::API::ScriptInfo;
TS_ASSERT_THROWS_NOTHING(repo->install(local_rep));
@@ -402,13 +404,14 @@ public:
"tofconverter description");
TS_ASSERT(information.author.empty());
TSM_ASSERT("check time",
- information.pub_date == DateAndTime("2012-02-10 10:00:50"));
+ information.pub_date == DateAndTimeHelpers::createFromISO8601(
+ "2012-02-10 10:00:50"));
TS_ASSERT(!information.auto_update);
}
/*************************************
- * Download
- *************************************/
+ * Download
+ *************************************/
/** Test that we are able to download files from the remote repository
*/
@@ -453,8 +456,8 @@ public:
}
/*************************************
- * UPDATE
- *************************************/
+ * UPDATE
+ *************************************/
void test_update() {
TS_ASSERT_THROWS_NOTHING(repo->install(local_rep));
std::vector<string> list_of_files;
@@ -622,8 +625,8 @@ public:
}
/*************************************
- * FILE STATUS
- *************************************/
+ * FILE STATUS
+ *************************************/
void test_info_of_one_file() {
std::string file_name = "TofConv/README.txt";
std::string dir_name = "TofConv";
@@ -730,8 +733,8 @@ public:
}
/*************************************
- * FILE STATUS
- *************************************/
+ * FILE STATUS
+ *************************************/
void test_info_of_downloaded_folder() {
std::string file_name = "TofConv/TofConverter.py";
std::string folder_name = "TofConv";
@@ -897,8 +900,8 @@ public:
}
/*************************************
- * SET IGNORE FILES
- *************************************/
+ * SET IGNORE FILES
+ *************************************/
void test_ignore_files() {
TS_ASSERT_THROWS_NOTHING(repo->install(local_rep));
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
index 93b7fab66f124f0b96564db30a313c6768fe378f..74442ea9763355364cccb6c0d1e0c2fb157ac1b5 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
@@ -15,7 +15,7 @@
#include "MantidDataObjects/MDEventFactory.h"
#include "MantidDataObjects/MDEventWorkspace.h"
#include "MantidDataObjects/MDLeanEvent.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/Utils.h"
#include "MantidKernel/make_unique.h"
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
index 9fb43aa103d15b9ac493121080938ee10445ff46..0e163cffeb53fd2663147069e576af1760bc1077 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
@@ -14,28 +14,24 @@
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
-#include "MantidAPI/Run.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidDataObjects/RebinnedOutput.h"
-#include "MantidDataObjects/Workspace2D.h"
-#include "MantidDataObjects/WorkspaceSingleValue.h"
-#include "MantidDataObjects/EventWorkspace.h"
-#include "MantidDataObjects/RebinnedOutput.h"
#include "MantidDataObjects/TableWorkspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidDataObjects/WorkspaceSingleValue.h"
#include "MantidGeometry/Instrument/Detector.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/make_unique.h"
namespace Mantid {
namespace DataObjects {
class PeaksWorkspace;
}
-}
+} // namespace Mantid
namespace WorkspaceCreationHelper {
/// Create a Fibonacci series
@@ -306,8 +302,8 @@ createEventWorkspace(int numPixels, int numBins, int numEvents = 100,
Mantid::DataObjects::EventWorkspace_sptr createEventWorkspaceWithStartTime(
int numPixels, int numBins, int numEvents = 100, double x0 = 0.0,
double binDelta = 1.0, int eventPattern = 1, int start_at_pixelID = 0,
- Mantid::Kernel::DateAndTime run_start =
- Mantid::Kernel::DateAndTime("2010-01-01T00:00:00"));
+ Mantid::Types::DateAndTime run_start =
+ Mantid::Types::DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
Mantid::DataObjects::EventWorkspace_sptr
createGroupedEventWorkspace(std::vector<std::vector<int>> groups, int numBins,
diff --git a/Framework/TestHelpers/src/ComponentCreationHelper.cpp b/Framework/TestHelpers/src/ComponentCreationHelper.cpp
index 85e290caf03b8e2e2714801b0afb60e8c9d05f05..578720984452fb65afe8b164cb306283e5e6c30f 100644
--- a/Framework/TestHelpers/src/ComponentCreationHelper.cpp
+++ b/Framework/TestHelpers/src/ComponentCreationHelper.cpp
@@ -13,7 +13,7 @@
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/make_unique.h"
#include "MantidKernel/Quat.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
diff --git a/Framework/TestHelpers/src/MDEventsTestHelper.cpp b/Framework/TestHelpers/src/MDEventsTestHelper.cpp
index 0011f7534351588a6440ad51344af7ebccd3688c..e6a8c270ad88e11d22e83074b8aa8b80158c516d 100644
--- a/Framework/TestHelpers/src/MDEventsTestHelper.cpp
+++ b/Framework/TestHelpers/src/MDEventsTestHelper.cpp
@@ -12,20 +12,20 @@
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/MatrixWorkspace.h"
-#include "MantidDataObjects/FakeMD.h"
#include "MantidDataObjects/EventWorkspace.h"
+#include "MantidDataObjects/FakeMD.h"
#include "MantidDataObjects/MDEventWorkspace.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
+#include "MantidGeometry/MDGeometry/GeneralFrame.h"
#include "MantidGeometry/MDGeometry/MDHistoDimension.h"
#include "MantidGeometry/MDGeometry/MDTypes.h"
-#include "MantidGeometry/MDGeometry/GeneralFrame.h"
-#include "MantidKernel/cow_ptr.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Utils.h"
+#include "MantidKernel/cow_ptr.h"
#include "MantidTestHelpers/FacilityHelper.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
@@ -39,12 +39,12 @@ namespace Mantid {
namespace DataObjects {
using namespace Mantid::API;
-using Mantid::DataObjects::EventWorkspace_sptr;
using Mantid::DataObjects::EventWorkspace;
+using Mantid::DataObjects::EventWorkspace_sptr;
using Mantid::Geometry::InstrumentDefinitionParser;
-using Mantid::Geometry::MDHistoDimension_sptr;
using Mantid::Geometry::MDHistoDimension;
-using Mantid::Kernel::DateAndTime;
+using Mantid::Geometry::MDHistoDimension_sptr;
+using namespace Mantid::Types;
namespace Strings = Mantid::Kernel::Strings;
/** Set of helper methods for testing MDEventWorkspace things
@@ -77,7 +77,8 @@ createDiffractionEventWorkspace(int numEvents, int numPixels, int numBins) {
retVal->populateInstrumentParameters();
retVal->setInstrument(instrument);
- DateAndTime run_start("2010-01-01T00:00:00");
+ DateAndTime run_start =
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00");
for (int pix = 0; pix < numPixels; pix++) {
for (int i = 0; i < numEvents; i++) {
@@ -367,6 +368,6 @@ void checkAndDeleteFile(std::string filename) {
}
}
-} // namespace
-}
-}
+} // namespace MDEventsTestHelper
+} // namespace DataObjects
+} // namespace Mantid
diff --git a/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp b/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
index 51be2f518703857a773b3c866bbc1456e541fc41..ec2b00f5a1ddcca70c3eae61606d1ddbc9d5360a 100644
--- a/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
+++ b/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
@@ -13,7 +13,6 @@
#include "MantidTestHelpers/InstrumentCreationHelper.h"
#include "MantidAPI/Algorithm.h"
-#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidAPI/IAlgorithm.h"
#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/Run.h"
@@ -27,11 +26,13 @@
#include "MantidGeometry/Crystal/OrientedLattice.h"
#include "MantidGeometry/Instrument/Component.h"
#include "MantidGeometry/Instrument/Detector.h"
+#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidGeometry/Instrument/Goniometer.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidHistogramData/LinearGenerator.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/MersenneTwister.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/TimeSeriesProperty.h"
@@ -51,6 +52,7 @@ using namespace Mantid::Geometry;
using namespace Mantid::HistogramData;
using Mantid::MantidVec;
using Mantid::MantidVecPtr;
+using namespace Mantid::Types;
MockAlgorithm::MockAlgorithm(size_t nSteps)
: m_Progress(
@@ -84,17 +86,17 @@ void removeWS(const std::string &name) {
}
/**
- * Creates bin or point based histograms based on the data passed
- * in for Y and E values and the bool specified.
- *
- * @param isHistogram :: Specifies whether the returned histogram
- * should use points or bin edges for the x axis. True gives bin edges.
- * @param yAxis :: Takes an rvalue (move) of the y axis for the new histogram
- * @param eAxis :: Takes an rvalue (move) of the e axis for the new histogram
- *
- * @return :: Returns a histogram with the user specified X axis type
- * and the data the user passed in.
- */
+ * Creates bin or point based histograms based on the data passed
+ * in for Y and E values and the bool specified.
+ *
+ * @param isHistogram :: Specifies whether the returned histogram
+ * should use points or bin edges for the x axis. True gives bin edges.
+ * @param yAxis :: Takes an rvalue (move) of the y axis for the new histogram
+ * @param eAxis :: Takes an rvalue (move) of the e axis for the new histogram
+ *
+ * @return :: Returns a histogram with the user specified X axis type
+ * and the data the user passed in.
+ */
template <typename YType, typename EType>
Histogram createHisto(bool isHistogram, YType &&yAxis, EType &&eAxis) {
// We don't need to check if y.size() == e.size() as the histogram
@@ -557,13 +559,13 @@ create2DWorkspaceWithReflectometryInstrument(double startX) {
}
/**
-* Create a very small 2D workspace for a virtual reflectometry instrument with
-* multiple detectors
-* @return workspace with instrument attached.
-* @param startX : X Tof start value for the workspace.
-* @param detSize : optional detector height (default is 0 which puts all
-* detectors at the same position)
-*/
+ * Create a very small 2D workspace for a virtual reflectometry instrument with
+ * multiple detectors
+ * @return workspace with instrument attached.
+ * @param startX : X Tof start value for the workspace.
+ * @param detSize : optional detector height (default is 0 which puts all
+ * detectors at the same position)
+ */
MatrixWorkspace_sptr create2DWorkspaceWithReflectometryInstrumentMultiDetector(
double startX, const double detSize) {
Instrument_sptr instrument = boost::make_shared<Instrument>();
@@ -702,7 +704,8 @@ EventWorkspace_sptr createEventWorkspace(int numPixels, int numBins,
int start_at_pixelID) {
return createEventWorkspaceWithStartTime(
numPixels, numBins, numEvents, x0, binDelta, eventPattern,
- start_at_pixelID, DateAndTime("2010-01-01T00:00:00"));
+ start_at_pixelID,
+ DateAndTimeHelpers::createFromISO8601("2010-01-01T00:00:00"));
}
/**
@@ -1234,17 +1237,17 @@ RebinnedOutput_sptr createRebinnedOutputWorkspace() {
}
/**
- * Populates the destination array (usually a mutable histogram)
- * starting at the index specified with the doubles provided in an
- * initializer list. Note the caller is responsible for ensuring
- * the destination has capacity for startingIndex + size(initializer list)
- * number of values
- *
- * @param destination :: The array to populate with data
- * @param startingIndex :: The index to start populating data at
- * @param values :: The initializer list to populate the array with
- * starting at the index specified
- */
+ * Populates the destination array (usually a mutable histogram)
+ * starting at the index specified with the doubles provided in an
+ * initializer list. Note the caller is responsible for ensuring
+ * the destination has capacity for startingIndex + size(initializer list)
+ * number of values
+ *
+ * @param destination :: The array to populate with data
+ * @param startingIndex :: The index to start populating data at
+ * @param values :: The initializer list to populate the array with
+ * starting at the index specified
+ */
template <typename T>
void populateWsWithInitList(T &destination, size_t startingIndex,
const std::initializer_list<double> &values) {
diff --git a/Framework/Types/CMakeLists.txt b/Framework/Types/CMakeLists.txt
index 3ae50b820ab29f9ecefd093ffecb96e6cf8e2f5f..615fcf90c5c4788e6ea887ee1590236c90611278 100644
--- a/Framework/Types/CMakeLists.txt
+++ b/Framework/Types/CMakeLists.txt
@@ -1,10 +1,15 @@
# This is not a module, there are no source files. Types in this folder must be header-only!
-
+set ( SRC_FILES
+ src/DateAndTime.cpp
+)
set ( INC_FILES
+ inc/MantidTypes/DateAndTime.h
+ inc/MantidTypes/DllConfig.h
inc/MantidTypes/SpectrumDefinition.h
)
set ( TEST_FILES
+ DateAndTimeTest.h
SpectrumDefinitionTest.h
)
@@ -14,7 +19,16 @@ if (COVERALLS)
endforeach(loop_var)
endif()
-add_library ( Types INTERFACE )
+add_library ( Types ${SRC_FILES} ${INC_FILES} )
+
+# Set the name of the generated library
+set_target_properties ( Types PROPERTIES OUTPUT_NAME MantidTypes
+ COMPILE_DEFINITIONS "IN_MANTID_TYPES" )
+
+# Add to the 'Framework' group in VS
+set_property ( TARGET Types PROPERTY FOLDER "MantidFramework" )
+
+target_link_libraries ( Types LINK_PUBLIC ${Boost_LIBRARIES} )
# Add the unit tests directory
add_subdirectory ( test )
diff --git a/Framework/Types/test/CMakeLists.txt b/Framework/Types/test/CMakeLists.txt
index ab7cb3387659a179461a744d33e6d15608e0abf3..94dae528e4db4e2640979d1ea7fdd979e09555bb 100644
--- a/Framework/Types/test/CMakeLists.txt
+++ b/Framework/Types/test/CMakeLists.txt
@@ -3,9 +3,11 @@ if ( CXXTEST_FOUND )
cxxtest_add_test ( TypesTest ${TEST_FILES} ${GMOCK_TEST_FILES})
target_link_libraries( TypesTest LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
+ Types
${Boost_LIBRARIES}
${GMOCK_LIBRARIES}
- ${GTEST_LIBRARIES} )
+ ${GTEST_LIBRARIES}
+ )
add_dependencies ( FrameworkTests TypesTest )
# Add to the 'FrameworkTests' group in VS
diff --git a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
index 9d0d85e266e3a8a9fc760abc91530ba5fce1cbdf..798c0bfd87ebca4eed75f6e51e8c0bd7e8d1d543 100644
--- a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+++ b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -346,7 +346,7 @@ void AlignAndFocusPowder::exec() {
if (tolerance > 0.) {
g_log.information() << "running CompressEvents(Tolerance=" << tolerance
<< ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr compressAlg = createChildAlgorithm("CompressEvents");
compressAlg->setProperty("InputWorkspace", m_outputEW);
compressAlg->setProperty("OutputWorkspace", m_outputEW);
@@ -369,7 +369,7 @@ void AlignAndFocusPowder::exec() {
g_log.information() << "running CropWorkspace(TOFmin=" << xmin
<< ", TOFmax=" << xmax << ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr cropAlg = createChildAlgorithm("CropWorkspace");
cropAlg->setProperty("InputWorkspace", m_outputW);
cropAlg->setProperty("OutputWorkspace", m_outputW);
@@ -390,7 +390,7 @@ void AlignAndFocusPowder::exec() {
if (m_outputEW->getNumberEvents() > 0) {
g_log.information() << "running RemovePromptPulse(Width="
<< removePromptPulseWidth << ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr filterPAlg =
createChildAlgorithm("RemovePromptPulse");
filterPAlg->setProperty("InputWorkspace", m_outputW);
@@ -407,7 +407,7 @@ void AlignAndFocusPowder::exec() {
if (maskBinTableWS) {
g_log.information() << "running MaskBinsFromTable started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr alg = createChildAlgorithm("MaskBinsFromTable");
alg->setProperty("InputWorkspace", m_outputW);
alg->setProperty("OutputWorkspace", m_outputW);
@@ -420,7 +420,7 @@ void AlignAndFocusPowder::exec() {
if (m_maskWS) {
g_log.information() << "running MaskDetectors started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr maskAlg = createChildAlgorithm("MaskDetectors");
maskAlg->setProperty("Workspace", m_outputW);
maskAlg->setProperty("MaskedWorkspace", m_maskWS);
@@ -437,7 +437,7 @@ void AlignAndFocusPowder::exec() {
if (m_calibrationWS) {
g_log.information() << "running AlignDetectors started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr alignAlg = createChildAlgorithm("AlignDetectors");
alignAlg->setProperty("InputWorkspace", m_outputW);
alignAlg->setProperty("OutputWorkspace", m_outputW);
@@ -458,7 +458,7 @@ void AlignAndFocusPowder::exec() {
if (LRef > 0.) {
g_log.information() << "running UnwrapSNS(LRef=" << LRef << ",Tmin=" << tmin
<< ",Tmax=" << tmax << ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr removeAlg = createChildAlgorithm("UnwrapSNS");
removeAlg->setProperty("InputWorkspace", m_outputW);
removeAlg->setProperty("OutputWorkspace", m_outputW);
@@ -489,7 +489,7 @@ void AlignAndFocusPowder::exec() {
if (!isEmpty(maxwl))
g_log.information() << ", WavelengthMax=" << maxwl;
g_log.information() << ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr removeAlg = createChildAlgorithm("CropWorkspace");
removeAlg->setProperty("InputWorkspace", m_outputW);
@@ -504,7 +504,7 @@ void AlignAndFocusPowder::exec() {
} else if (DIFCref > 0.) {
g_log.information() << "running RemoveLowResTof(RefDIFC=" << DIFCref
<< ",K=3.22) started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
EventWorkspace_sptr ews =
boost::dynamic_pointer_cast<EventWorkspace>(m_outputW);
if (ews)
@@ -628,7 +628,7 @@ void AlignAndFocusPowder::exec() {
if ((m_outputEW) && (tolerance > 0.)) {
g_log.information() << "running CompressEvents(Tolerance=" << tolerance
<< ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr compressAlg = createChildAlgorithm("CompressEvents");
compressAlg->setProperty("InputWorkspace", m_outputEW);
compressAlg->setProperty("OutputWorkspace", m_outputEW);
@@ -664,7 +664,7 @@ API::MatrixWorkspace_sptr AlignAndFocusPowder::editInstrument(
std::vector<specnum_t> specids, std::vector<double> l2s,
std::vector<double> phis) {
g_log.information() << "running EditInstrumentGeometry started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr editAlg = createChildAlgorithm("EditInstrumentGeometry");
editAlg->setProperty("Workspace", ws);
@@ -696,7 +696,7 @@ AlignAndFocusPowder::diffractionFocus(API::MatrixWorkspace_sptr ws) {
}
g_log.information() << "running DiffractionFocussing started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr focusAlg = createChildAlgorithm("DiffractionFocussing");
focusAlg->setProperty("InputWorkspace", ws);
@@ -717,7 +717,7 @@ AlignAndFocusPowder::convertUnits(API::MatrixWorkspace_sptr matrixws,
std::string target) {
g_log.information() << "running ConvertUnits(Target=" << target
<< ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr convert2Alg = createChildAlgorithm("ConvertUnits");
convert2Alg->setProperty("InputWorkspace", matrixws);
@@ -741,7 +741,7 @@ AlignAndFocusPowder::rebin(API::MatrixWorkspace_sptr matrixws) {
<< ", LogBinning=" << (m_resampleX < 0) << ", dMin("
<< m_dmins.size() << "), dmax(" << m_dmaxs.size()
<< ")) started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr alg = createChildAlgorithm("ResampleX");
alg->setProperty("InputWorkspace", matrixws);
alg->setProperty("OutputWorkspace", matrixws);
@@ -766,7 +766,7 @@ AlignAndFocusPowder::rebin(API::MatrixWorkspace_sptr matrixws) {
for (double param : m_params)
g_log.information() << param << " ";
g_log.information() << ") started at "
- << Kernel::DateAndTime::getCurrentTime() << "\n";
+ << Mantid::Types::DateAndTime::getCurrentTime() << "\n";
API::IAlgorithm_sptr rebin3Alg = createChildAlgorithm("Rebin");
rebin3Alg->setProperty("InputWorkspace", matrixws);
rebin3Alg->setProperty("OutputWorkspace", matrixws);
diff --git a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
index a7c813160c6ed446e560c38987f3fb735458b941..cb7000941a9ccef963cfa3474c1ba8b826b124ca 100644
--- a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
+++ b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
@@ -88,7 +88,7 @@ AlgExecSummaryGrpBox::~AlgExecSummaryGrpBox() {
}
}
void AlgExecSummaryGrpBox::setData(const double execDuration,
- const Mantid::Kernel::DateAndTime execDate) {
+ const Mantid::Types::DateAndTime execDate) {
QString dur("");
dur.setNum(execDuration, 'g', 6);
dur += " seconds";
@@ -319,7 +319,7 @@ AlgExecSummaryGrpBox *AlgorithmHistoryWindow::createExecSummaryGrpBox() {
const auto entry = m_algHist.getAlgorithmHistory(i);
double duration = 0;
duration = entry->executionDuration();
- Mantid::Kernel::DateAndTime date = entry->executionDate();
+ Mantid::Types::DateAndTime date = entry->executionDate();
pgrpBox->setData(duration, date);
}
return pgrpBox;
@@ -448,7 +448,7 @@ void AlgorithmHistoryWindow::updateExecSummaryGrpBox(
AlgorithmHistory_const_sptr algHistory) {
// getting the selcted algorithm at pos from History vector
double duration = algHistory->executionDuration();
- Mantid::Kernel::DateAndTime date = algHistory->executionDate();
+ Mantid::Types::DateAndTime date = algHistory->executionDate();
if (m_execSumGrpBox)
m_execSumGrpBox->setData(duration, date);
}
diff --git a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h
index 75a334568ceb77ae975ccfa5bc666c2b15c229c6..ae19b7204999c7cd6feffdb497d7018b5b31a32e 100644
--- a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h
+++ b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h
@@ -5,7 +5,7 @@
#include "MantidAPI/HistoryView.h"
#include "MantidAPI/ScriptBuilder.h"
#include "MantidAPI/WorkspaceHistory.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/EnvironmentHistory.h"
#include "MantidQtWidgets/Common/MantidDialog.h"
@@ -91,7 +91,7 @@ public:
AlgExecSummaryGrpBox(QString, QWidget *w);
~AlgExecSummaryGrpBox() override;
void setData(const double execDuration,
- const Mantid::Kernel::DateAndTime execDate);
+ const Mantid::Types::DateAndTime execDate);
private:
QLineEdit *getAlgExecDurationCtrl() const { return m_execDurationEdit; }
diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp
index 3863eabb10ebd141bbe9be158f9e3cf3978f8951..c74cb6c6db7439b47f61c9b3ea056f7798514d2f 100644
--- a/MantidPlot/src/Mantid/MantidUI.cpp
+++ b/MantidPlot/src/Mantid/MantidUI.cpp
@@ -5,7 +5,6 @@
#include "AlgorithmHistoryWindow.h"
#include "AlgorithmMonitor.h"
#include "ImportWorkspaceDlg.h"
-#include "MantidSurfaceContourPlotGenerator.h"
#include "MantidMDCurve.h"
#include "MantidMDCurveDialog.h"
#include "MantidMatrix.h"
@@ -14,29 +13,30 @@
#include "MantidQtWidgets/Common/MantidWSIndexDialog.h"
#include "MantidSampleLogDialog.h"
#include "MantidSampleMaterialDialog.h"
+#include "MantidSurfaceContourPlotGenerator.h"
#include "MantidTable.h"
#include "MantidUI.h"
#include "ProjectSerialiser.h"
-#include "ui_SequentialFitDialog.h"
#include "../Folder.h"
#include "../ScriptingWindow.h"
#include "../Spectrogram.h"
#include "../TiledWindow.h"
#include "MantidQtWidgets/Common/pixmaps.h"
+#include "ui_SequentialFitDialog.h" T
#include "Mantid/InstrumentWidget/InstrumentWindow.h"
#include "MantidAPI/Axis.h"
#include "MantidAPI/TextAxis.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/EnvironmentHistory.h"
#include "MantidKernel/FacilityInfo.h"
#include "MantidKernel/LogFilter.h"
#include "MantidKernel/Property.h"
+#include "MantidKernel/TimeInterval.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/UnitConversion.h"
+#include "MantidTypes/DateAndTime.h"
#include "InstrumentWidget/InstrumentWindow.h"
@@ -66,8 +66,6 @@
#include <QMenu>
#include <QMenuBar>
#include <QMessageBox>
-#include <QMessageBox>
-#include <QTextEdit>
#include <QTextEdit>
#include <QToolBar>
@@ -102,9 +100,9 @@ using namespace std;
using namespace Mantid::API;
using namespace MantidQt::API;
using namespace MantidQt::MantidWidgets;
-using MantidQt::MantidWidgets::MantidWSIndexDialog;
+using Mantid::Types::DateAndTime;
using MantidQt::MantidWidgets::MantidTreeWidget;
-using Mantid::Kernel::DateAndTime;
+using MantidQt::MantidWidgets::MantidWSIndexDialog;
using MantidQt::SliceViewer::SliceViewerWindow;
namespace MantidException = Mantid::Kernel::Exception;
@@ -206,7 +204,7 @@ getWorkspacesFromAds(const QList<QString> &workspaceNames) {
}
return workspaces;
}
-}
+} // namespace
MantidUI::MantidUI(ApplicationWindow *aw)
: m_finishedLoadDAEObserver(*this,
@@ -290,11 +288,12 @@ MantidUI::MantidUI(ApplicationWindow *aw)
SLOT(algorithmStarted(void *)), Qt::QueuedConnection);
connect(m_algMonitor, SIGNAL(algorithmFinished(void *)), m_exploreAlgorithms,
SLOT(algorithmFinished(void *)), Qt::QueuedConnection);
- connect(m_algMonitor, SIGNAL(needUpdateProgress(
- void *, double, const QString &, double, int)),
- m_exploreAlgorithms,
- SLOT(updateProgress(void *, double, const QString &, double, int)),
- Qt::QueuedConnection);
+ connect(
+ m_algMonitor,
+ SIGNAL(needUpdateProgress(void *, double, const QString &, double, int)),
+ m_exploreAlgorithms,
+ SLOT(updateProgress(void *, double, const QString &, double, int)),
+ Qt::QueuedConnection);
m_algMonitor->start();
@@ -327,8 +326,9 @@ void MantidUI::init() {
connect(m_defaultFitFunction,
SIGNAL(executeFit(QString, QHash<QString, QString>,
Mantid::API::AlgorithmObserver *)),
- this, SLOT(showAlgorithmDialog(QString, QHash<QString, QString>,
- Mantid::API::AlgorithmObserver *)));
+ this,
+ SLOT(showAlgorithmDialog(QString, QHash<QString, QString>,
+ Mantid::API::AlgorithmObserver *)));
m_defaultFitFunction->hide();
m_appWindow->addDockWidget(Qt::LeftDockWidgetArea, m_defaultFitFunction);
@@ -380,10 +380,9 @@ void MantidUI::showFitPropertyBrowser(bool on) {
}
/**
-* Be careful where this is called, if it is a called too late in the Qt shutdown
-* the application
-* crashes
-*/
+ * Be careful where this is called, if it is a called too late in the Qt
+ * shutdown the application crashes
+ */
void MantidUI::shutdown() {
g_log.notice("MantidPlot is shutting down...");
@@ -458,17 +457,17 @@ QStringList MantidUI::getAlgorithmNames() {
}
/**
-* Returns the number of algorithms currently executing
-*/
+ * Returns the number of algorithms currently executing
+ */
int MantidUI::runningAlgCount() const { return m_algMonitor->count(); }
/**
-* Alerts applicationWindow that the ADS has been modified.
-*/
+ * Alerts applicationWindow that the ADS has been modified.
+ */
void MantidUI::updateProject() { m_appWindow->modifiedProject(); }
/**
-* Ticket #678
-*/
+ * Ticket #678
+ */
void MantidUI::saveNexusWorkspace() { executeSaveNexus(); }
/**
@@ -545,7 +544,7 @@ MantidUI::getWorkspace(const QString &workspaceName) {
}
/** Extension to ApplicationWindow::menuAboutToShow() to deal with Mantid.
-*/
+ */
bool MantidUI::menuAboutToShow(MdiSubWindow *w) {
if (w && isOfType(w, "MantidMatrix")) {
@@ -654,14 +653,14 @@ void MantidUI::importWorkspace(const QString &wsName, bool showDlg,
}
/** Import the selected workspace, if any. Displays the import dialog.
-*/
+ */
void MantidUI::importWorkspace() {
QString wsName = getSelectedWorkspaceName();
importWorkspace(wsName, true, true);
}
/** Import the selected table workspace transposed.
-*/
+ */
void MantidUI::importTransposed() {
ScopedOverrideCursor waitCursor;
QString wsName = getSelectedWorkspaceName();
@@ -674,7 +673,7 @@ void MantidUI::importTransposed() {
}
/** Create a TableWorkspace of box data from the MDEventWorkspace
-*/
+ */
void MantidUI::importBoxDataTable() {
std::cout << "MantidUI::importBoxDataTable()\n";
QString wsName = getSelectedWorkspaceName();
@@ -696,9 +695,9 @@ void MantidUI::importBoxDataTable() {
}
/** Plots a Curve showing intensities for a MDWorkspace.
-* But only if the workspace meets certain criteria, such as
-* having only one non-integrated dimension. Should exit gracefully otherwise.
-*/
+ * But only if the workspace meets certain criteria, such as
+ * having only one non-integrated dimension. Should exit gracefully otherwise.
+ */
void MantidUI::showMDPlot() {
QString wsName = getSelectedWorkspaceName();
@@ -957,8 +956,8 @@ void MantidUI::showSpectrumViewer() {
}
/** Create a window with a SliceViewer widget to show
-* the selected workspace
-*/
+ * the selected workspace
+ */
void MantidUI::showSliceViewer() {
// Retrieve the MDWorkspace
QString wsName = getSelectedWorkspaceName();
@@ -1213,8 +1212,8 @@ Table *MantidUI::createTableDetectors(MantidMatrix *m) {
}
/**
-* Show the detector table - this method is here for the Python interface
-*/
+ * Show the detector table - this method is here for the Python interface
+ */
Table *MantidUI::createDetectorTable(const QString &wsName) {
std::vector<int> indices;
Table *t = createDetectorTable(wsName, indices);
@@ -1222,14 +1221,14 @@ Table *MantidUI::createDetectorTable(const QString &wsName) {
}
/**
-* Create the relevant detector table for the given workspace
-* @param wsName :: The name of the workspace
-* @param indices :: Limit the table to these workspace indices (MatrixWorkspace
-* only). If the vector is empty,
-* all the indices are used.
-* @param include_data :: If true then first value from the each spectrum is
-* displayed (MatrixWorkspace only)
-*/
+ * Create the relevant detector table for the given workspace
+ * @param wsName :: The name of the workspace
+ * @param indices :: Limit the table to these workspace indices (MatrixWorkspace
+ * only). If the vector is empty,
+ * all the indices are used.
+ * @param include_data :: If true then first value from the each spectrum is
+ * displayed (MatrixWorkspace only)
+ */
Table *MantidUI::createDetectorTable(const QString &wsName,
const std::vector<int> &indices,
bool include_data) {
@@ -1249,13 +1248,13 @@ Table *MantidUI::createDetectorTable(const QString &wsName,
}
/**
-* Create the instrument detector table from a MatrixWorkspace
-* @param wsName :: The name of the workspace
-* @param ws :: A pointer to a MatrixWorkspace
-* @param indices :: Limit the table to these workspace indices
-* @param include_data :: If true then first value from the each spectrum is
-* displayed
-*/
+ * Create the instrument detector table from a MatrixWorkspace
+ * @param wsName :: The name of the workspace
+ * @param ws :: A pointer to a MatrixWorkspace
+ * @param indices :: Limit the table to these workspace indices
+ * @param include_data :: If true then first value from the each spectrum is
+ * displayed
+ */
Table *MantidUI::createDetectorTable(
const QString &wsName, const Mantid::API::MatrixWorkspace_sptr &ws,
const std::vector<int> &indices, bool include_data) {
@@ -1355,11 +1354,11 @@ Table *MantidUI::createDetectorTable(
throw std::runtime_error("No detectors found.");
if (!signedThetaParamRetrieved) {
const std::vector<std::string> ¶meters =
- spectrumInfo.detector(wsIndex)
- .getStringParameter("show-signed-theta", true); // recursive
- showSignedTwoTheta = (!parameters.empty() &&
- find(parameters.begin(), parameters.end(),
- "Always") != parameters.end());
+ spectrumInfo.detector(wsIndex).getStringParameter(
+ "show-signed-theta", true); // recursive
+ showSignedTwoTheta =
+ (!parameters.empty() && find(parameters.begin(), parameters.end(),
+ "Always") != parameters.end());
signedThetaParamRetrieved = true;
}
@@ -1474,11 +1473,11 @@ Table *MantidUI::createDetectorTable(
}
/**
-* Creates a table showing the detectors contributing to the peaks within a
-* PeaksWorkspace
-* @param wsName :: The name of the workspace
-* @param ws :: A pointer to an IPeaksWorkspace object
-*/
+ * Creates a table showing the detectors contributing to the peaks within a
+ * PeaksWorkspace
+ * @param wsName :: The name of the workspace
+ * @param ws :: A pointer to an IPeaksWorkspace object
+ */
Table *
MantidUI::createDetectorTable(const QString &wsName,
const Mantid::API::IPeaksWorkspace_sptr &ws) {
@@ -1634,11 +1633,11 @@ void MantidUI::executeSaveNexus() {
//-----------------------------------------------------------------------------
/** Open an algorithm dialog to execute the named algorithm.
-*
-* @param algName :: name of the algorithm
-* @param version :: version number, -1 for latest
-* @return true if sucessful.
-*/
+ *
+ * @param algName :: name of the algorithm
+ * @param version :: version number, -1 for latest
+ * @return true if sucessful.
+ */
void MantidUI::showAlgorithmDialog(const QString &algName, int version) {
Mantid::API::IAlgorithm_sptr alg = this->createAlgorithm(algName, version);
if (!alg)
@@ -1658,16 +1657,15 @@ void MantidUI::showAlgorithmDialog(const QString &algName, int version) {
}
/**
-* Execute an algorithm. Show the algorithm dialog before executing. The property
-* widgets will be preset
-* with values in paramList.
-* @param algName :: The algorithm name
-* @param paramList :: A list of algorithm properties to be passed to
-* Algorithm::setProperties
-* @param obs :: A pointer to an instance of AlgorithmObserver which will be
-* attached to the finish notification
-* @param version :: version number, -1 for latest
-*/
+ * Execute an algorithm. Show the algorithm dialog before executing. The
+ * property widgets will be preset with values in paramList.
+ * @param algName :: The algorithm name
+ * @param paramList :: A list of algorithm properties to be passed to
+ * Algorithm::setProperties
+ * @param obs :: A pointer to an instance of AlgorithmObserver which will be
+ * attached to the finish notification
+ * @param version :: version number, -1 for latest
+ */
void MantidUI::showAlgorithmDialog(const QString &algName,
QHash<QString, QString> paramList,
Mantid::API::AlgorithmObserver *obs,
@@ -1700,17 +1698,17 @@ void MantidUI::showAlgorithmDialog(const QString &algName,
}
/**
-* Slot for executing an algorithm.
-* @param alg :: Shared pointer to an algorithm to execute with all properties
-* already set.
-*/
+ * Slot for executing an algorithm.
+ * @param alg :: Shared pointer to an algorithm to execute with all properties
+ * already set.
+ */
void MantidUI::executeAlgorithm(Mantid::API::IAlgorithm_sptr alg) {
executeAlgorithmAsync(alg);
}
/**
-* This creates an algorithm dialog (the default property entry thingie).
-*/
+ * This creates an algorithm dialog (the default property entry thingie).
+ */
MantidQt::API::AlgorithmDialog *
MantidUI::createAlgorithmDialog(Mantid::API::IAlgorithm_sptr alg) {
QHash<QString, QString> presets;
@@ -1751,9 +1749,9 @@ MantidUI::createAlgorithmDialog(Mantid::API::IAlgorithm_sptr alg) {
}
/**
-* Find the first input workspace for an algorithm
-* @param algorithm :: A pointer to the algorithm instance
-*/
+ * Find the first input workspace for an algorithm
+ * @param algorithm :: A pointer to the algorithm instance
+ */
QString MantidUI::findInputWorkspaceProperty(
Mantid::API::IAlgorithm_sptr algorithm) const {
// Iterate through the properties and find the first input one
@@ -1788,10 +1786,11 @@ void MantidUI::copyWorkspacestoVector(
}
/**
-* Determine if the workspace has one or more UB matrixes on one of it's samples.
-* @param wsName
-* @return True if present
-*/
+ * Determine if the workspace has one or more UB matrixes on one of it's
+ * samples.
+ * @param wsName
+ * @return True if present
+ */
bool MantidUI::hasUB(const QString &wsName) {
const std::string algName("HasUB");
Mantid::API::IAlgorithm_sptr alg;
@@ -1817,9 +1816,9 @@ bool MantidUI::hasUB(const QString &wsName) {
}
/**
-* Clears the UB from the selected workspace
-* @param wsName :: selected workspace name
-*/
+ * Clears the UB from the selected workspace
+ * @param wsName :: selected workspace name
+ */
void MantidUI::clearUB(const QStringList &wsName) {
const std::string algName("ClearUB");
const int version = -1;
@@ -1844,9 +1843,9 @@ void MantidUI::clearUB(const QStringList &wsName) {
}
/**
-* Renames selected workspace
-* @param wsName :: selected workspace name
-*/
+ * Renames selected workspace
+ * @param wsName :: selected workspace name
+ */
void MantidUI::renameWorkspace(QStringList wsName) {
// If the wsname is blank look for an active window and assume this workspace
// is
@@ -2011,9 +2010,9 @@ bool MantidUI::executeAlgorithmAsync(Mantid::API::IAlgorithm_sptr alg,
}
/**
-* Slot to update the recent files list (from main appWindow) when accepting
-* LoadDialog dialogs
-*/
+ * Slot to update the recent files list (from main appWindow) when accepting
+ * LoadDialog dialogs
+ */
void MantidUI::loadFileDialogAccept() {
QObject *sender = QObject::sender();
MantidQt::API::AlgorithmDialog *dlg =
@@ -2099,13 +2098,14 @@ void MantidUI::manageMantidWorkspaces() {
}
/** Create an instrument window from a named workspace.
-* The window will be returned hidden.
-* @param wsName The name of the workspace for which to generate the instrument
-* view.
-* @param tab The index of the tab (starting from 0) to initially display
-* (default: 0)
-* @return A pointer to the instrument window widget if created. NULL otherwise.
-*/
+ * The window will be returned hidden.
+ * @param wsName The name of the workspace for which to generate the instrument
+ * view.
+ * @param tab The index of the tab (starting from 0) to initially display
+ * (default: 0)
+ * @return A pointer to the instrument window widget if created. NULL
+ * otherwise.
+ */
InstrumentWindow *MantidUI::getInstrumentView(const QString &wsName, int tab) {
if (!Mantid::API::AnalysisDataService::Instance().doesExist(
wsName.toStdString()))
@@ -2247,8 +2247,8 @@ void MantidUI::enableSaveNexus(const QString &wsName) {
void MantidUI::disableSaveNexus() { appWindow()->disableSaveNexus(); }
/**
-* Prepares the Mantid Menu depending on the state of the active MantidMatrix.
-*/
+ * Prepares the Mantid Menu depending on the state of the active MantidMatrix.
+ */
void MantidUI::menuMantidMatrixAboutToShow() {
menuMantidMatrix->clear();
MantidMatrix *w = dynamic_cast<MantidMatrix *>(appWindow()->activeWindow());
@@ -2317,16 +2317,16 @@ MultiLayer *MantidUI::plotInstrumentSpectrumList(const QString &wsName,
}
/**
-* Sets the flag that tells the scripting environment that
-* a script is currently running
-*/
+ * Sets the flag that tells the scripting environment that
+ * a script is currently running
+ */
void MantidUI::setIsRunning(bool) {
// deprecated
}
/**
-* Merge the curves from the two given MultiLayer objects
-*/
+ * Merge the curves from the two given MultiLayer objects
+ */
MultiLayer *MantidUI::mergePlots(MultiLayer *mlayer_1, MultiLayer *mlayer_2) {
if (!mlayer_1)
return NULL;
@@ -2391,20 +2391,20 @@ bool MantidUI::createScriptInputDialog(const QString &alg_name,
}
/** Displays a string in a Qtiplot table
-* @param logName :: the title of the table is based on this
-* @param data :: the string to display
-*/
+ * @param logName :: the title of the table is based on this
+ * @param data :: the string to display
+ */
void MantidUI::importString(const QString &logName, const QString &data) {
importString(logName, data, QString(""));
}
/** Displays a string in a Qtiplot table
-* @param logName :: the title of the table is based on this
-* @param data :: the string to display
-* @param sep :: the seperator character
-* @param wsName :: add workspace name to the table window title bar, defaults
-* to logname if left blank
-*/
+ * @param logName :: the title of the table is based on this
+ * @param data :: the string to display
+ * @param sep :: the seperator character
+ * @param wsName :: add workspace name to the table window title bar, defaults
+ * to logname if left blank
+ */
void MantidUI::importString(const QString &logName, const QString &data,
const QString &sep, const QString &wsName) {
QStringList loglines = QStringList(data);
@@ -2439,11 +2439,11 @@ void MantidUI::importString(const QString &logName, const QString &data,
t->showNormal();
}
/** Displays a string in a Qtiplot table
-* @param logName :: the title of the table is based on this
-* @param data :: a formatted string with the time series data to display
-* @param wsName :: add workspace name to the table window title bar, defaults
-* to logname if left blank
-*/
+ * @param logName :: the title of the table is based on this
+ * @param data :: a formatted string with the time series data to display
+ * @param wsName :: add workspace name to the table window title bar, defaults
+ * to logname if left blank
+ */
void MantidUI::importStrSeriesLog(const QString &logName, const QString &data,
const QString &wsName) {
QStringList loglines = data.split("\n", QString::SkipEmptyParts);
@@ -2493,22 +2493,22 @@ void MantidUI::importStrSeriesLog(const QString &logName, const QString &data,
//------------------------------------------------------------------------------------------------
/** Import a numeric log data. It will be shown in a graph and copied into a
-* table
-* @param wsName :: The workspace name which log data will be imported
-* @param logName :: The name of the log property to import
-* @param filter :: Filter flag telling how to filter the log data.
-* - 0 means no filtering
-* - 1 filter by running status
-* - 2 filter by period
-* - 3 filter by status & period
-*/
+ * table
+ * @param wsName :: The workspace name which log data will be imported
+ * @param logName :: The name of the log property to import
+ * @param filter :: Filter flag telling how to filter the log data.
+ * - 0 means no filtering
+ * - 1 filter by running status
+ * - 2 filter by period
+ * - 3 filter by status & period
+ */
void MantidUI::importNumSeriesLog(const QString &wsName, const QString &logName,
int filter) {
// if you need to add a final filter value to the end of the filter to match
// the extent of the data, then set this to the index of the row to add the
// value
int addFinalFilterValueIndex = 0;
- Mantid::Kernel::DateAndTime lastFilterTime;
+ DateAndTime lastFilterTime;
// Convert input int into enum value
const Mantid::API::LogFilterGenerator::FilterType filterType = [&filter]() {
@@ -2558,7 +2558,7 @@ void MantidUI::importNumSeriesLog(const QString &wsName, const QString &logName,
formatLogName(label, wsName);
// Get the starting time of the log.
- Mantid::Kernel::DateAndTime startTime;
+ DateAndTime startTime;
// Toggle to switch between using the real date or the change in seconds.
bool useAbsoluteDate = false;
@@ -2652,7 +2652,7 @@ void MantidUI::importNumSeriesLog(const QString &wsName, const QString &logName,
} // end (valid filter exists)
}
- Mantid::Kernel::DateAndTime lastTime;
+ Mantid::Types::DateAndTime lastTime;
double lastValue = 0;
// Iterate through the time-value map.
@@ -2726,7 +2726,7 @@ void MantidUI::importNumSeriesLog(const QString &wsName, const QString &logName,
// Set x-axis label format
if (useAbsoluteDate) {
- Mantid::Kernel::DateAndTime label_as_ptime =
+ Mantid::Types::DateAndTime label_as_ptime =
flt->data()->nthInterval(0).begin();
QDateTime dt = QDateTime::fromTime_t(uint(label_as_ptime.to_localtime_t()));
QString format = dt.toString(Qt::ISODate) + ";HH:mm:ss";
@@ -2781,17 +2781,17 @@ void MantidUI::configModified() {
appWindow()->isDeleteWorkspacePromptEnabled());
}
-std::string MantidUI::extractLogTime(Mantid::Kernel::DateAndTime value,
+std::string MantidUI::extractLogTime(Mantid::Types::DateAndTime value,
bool useAbsoluteDate,
- Mantid::Kernel::DateAndTime start) {
+ Mantid::Types::DateAndTime start) {
std::string time_string;
if (useAbsoluteDate) {
// Convert time into string
time_string = value.toSimpleString();
} else {
// How many seconds elapsed?
- Mantid::Kernel::time_duration elapsed = value - start;
- double seconds = Mantid::Kernel::DateAndTime::secondsFromDuration(elapsed);
+ Mantid::Types::time_duration elapsed = value - start;
+ double seconds = Mantid::Types::DateAndTime::secondsFromDuration(elapsed);
// Output with 6 decimal points
std::ostringstream oss;
@@ -3221,12 +3221,12 @@ MultiLayer *MantidUI::plot1D(const QMultiMap<QString, int> &toPlot,
}
/* Get the log values and put into a curve spec list in preparation of
-* the creation of the curves
-* @param curveSpecList :: list of curve specs to recieve the logs
-* @param toPlot :: workspaces to plot
-* @param log :: log value
-* @param customLogValues :: custom log values
-*/
+ * the creation of the curves
+ * @param curveSpecList :: list of curve specs to recieve the logs
+ * @param toPlot :: workspaces to plot
+ * @param log :: log value
+ * @param customLogValues :: custom log values
+ */
void MantidUI::putLogsIntoCurveSpecs(std::vector<CurveSpec> &curveSpecList,
const QMultiMap<QString, int> &toPlot,
const QString &log,
@@ -3269,13 +3269,13 @@ void MantidUI::putLogsIntoCurveSpecs(std::vector<CurveSpec> &curveSpecList,
}
/**
-* Draw a color fill plot for each of the listed workspaces. Unfortunately the
-* plotting is
-* initimately linked to MantidMatrix so that one of these needs to be created
-* first
-* @param ui :: the sequential fitting UI form
-* @param fitbrowser :: pointer to the fit property browser
-*/
+ * Draw a color fill plot for each of the listed workspaces. Unfortunately the
+ * plotting is
+ * initimately linked to MantidMatrix so that one of these needs to be created
+ * first
+ * @param ui :: the sequential fitting UI form
+ * @param fitbrowser :: pointer to the fit property browser
+ */
void MantidUI::showSequentialPlot(
Ui::SequentialFitDialog *ui,
MantidQt::MantidWidgets::FitPropertyBrowser *fitbrowser) {
@@ -3318,13 +3318,13 @@ void MantidUI::showSequentialPlot(
}
/**
-* Draw a color fill plot for each of the listed workspaces. Unfortunately the
-* plotting is
-* initimately linked to MantidMatrix so that one of these needs to be created
-* first
-* @param wsNames :: For each workspace listed create a 2D colorfill plot
-* @param curveType :: The curve type for each of the plots
-*/
+ * Draw a color fill plot for each of the listed workspaces. Unfortunately the
+ * plotting is
+ * initimately linked to MantidMatrix so that one of these needs to be created
+ * first
+ * @param wsNames :: For each workspace listed create a 2D colorfill plot
+ * @param curveType :: The curve type for each of the plots
+ */
void MantidUI::drawColorFillPlots(const QStringList &wsNames,
GraphOptions::CurveType curveType) {
int nPlots = wsNames.size();
@@ -3379,15 +3379,15 @@ void MantidUI::drawColorFillPlots(const QStringList &wsNames,
}
/**
-* Draw a single ColorFill plot for the named workspace
-* @param wsName :: The name of the workspace which provides data for the plot
-* @param curveType :: The type of curve
-* @param window :: An optional pointer to a plot window. If not NULL the window
-* is cleared
-* and reused
-* @param hidden
-* @returns A pointer to the created plot
-*/
+ * Draw a single ColorFill plot for the named workspace
+ * @param wsName :: The name of the workspace which provides data for the plot
+ * @param curveType :: The type of curve
+ * @param window :: An optional pointer to a plot window. If not NULL the window
+ * is cleared
+ * and reused
+ * @param hidden
+ * @returns A pointer to the created plot
+ */
MultiLayer *MantidUI::drawSingleColorFillPlot(const QString &wsName,
GraphOptions::CurveType curveType,
MultiLayer *window, bool hidden) {
@@ -3459,9 +3459,9 @@ MultiLayer *MantidUI::plotSpectraRange(const QString &wsName, int i0, int i1,
if (i0 < 0 || i1 < 0)
return 0;
/** For instrument with one to many spectra-detector mapping,
- * different pixels with correspond to the same specta so
- * we need to remove doublons in this case.
- */
+ * different pixels with correspond to the same specta so
+ * we need to remove doublons in this case.
+ */
std::set<int> indexList;
for (int i = i0; i <= i1; i++)
indexList.insert(i);
@@ -3636,16 +3636,16 @@ void MantidUI::plotLayerOfMultilayer(MultiLayer *multi, const bool plotErrors,
};
// Lambda to set axis label hiding
- const auto formatAxes =
- [&nRows, &nCols, &nPlots](Graph *layer, const int row, const int col) {
- const bool drawYAxisLabel = col == 0;
- if (!drawXAxisLabel(row, col, nRows, nCols, nPlots)) {
- layer->setXAxisTitle(QString::null);
- }
- if (!drawYAxisLabel) {
- layer->setYAxisTitle(QString::null);
- }
- };
+ const auto formatAxes = [&nRows, &nCols, &nPlots](Graph *layer, const int row,
+ const int col) {
+ const bool drawYAxisLabel = col == 0;
+ if (!drawXAxisLabel(row, col, nRows, nCols, nPlots)) {
+ layer->setXAxisTitle(QString::null);
+ }
+ if (!drawYAxisLabel) {
+ layer->setYAxisTitle(QString::null);
+ }
+ };
const bool isFitResult = workspaceIsFitResult(wsName);
@@ -3788,9 +3788,9 @@ Table *MantidUI::createTableFromSelectedColumns(MantidMatrix *m, bool errs) {
}
/** Saves data to nexus file
-* @param wsName :: Name of the workspace to be saved
-* @param fileName :: name of the nexus file to created
-*/
+ * @param wsName :: Name of the workspace to be saved
+ * @param fileName :: name of the nexus file to created
+ */
void MantidUI::savedatainNexusFormat(const std::string &fileName,
const std::string &wsName) {
auto inputWorkspace =
@@ -3813,9 +3813,9 @@ void MantidUI::savedatainNexusFormat(const std::string &fileName,
}
}
/** Loads data from nexus file
-* @param wsName :: Name of the workspace to be created
-* @param fileName :: name of the nexus file
-*/
+ * @param wsName :: Name of the workspace to be created
+ * @param fileName :: name of the nexus file
+ */
void MantidUI::loadWSFromFile(const std::string &wsName,
const std::string &fileName) {
if (fileName.empty())
@@ -3830,9 +3830,8 @@ void MantidUI::loadWSFromFile(const std::string &wsName,
}
bool MantidUI::workspacesDockPlot1To1() {
- return "On" ==
- Mantid::Kernel::ConfigService::Instance().getString(
- "MantidOptions.ReusePlotInstances");
+ return "On" == Mantid::Kernel::ConfigService::Instance().getString(
+ "MantidOptions.ReusePlotInstances");
}
/**
diff --git a/MantidPlot/src/Mantid/MantidUI.h b/MantidPlot/src/Mantid/MantidUI.h
index 343094430e8cc73e24e079db89be02ac16a4d8b9..5f825facc40717efd952498de6b24060d26ce851 100644
--- a/MantidPlot/src/Mantid/MantidUI.h
+++ b/MantidPlot/src/Mantid/MantidUI.h
@@ -616,9 +616,9 @@ private:
/// This method accepts user inputs and executes loadraw/load nexus
/// algorithm
- std::string extractLogTime(Mantid::Kernel::DateAndTime value,
+ std::string extractLogTime(Mantid::Types::DateAndTime value,
bool useAbsoluteDate,
- Mantid::Kernel::DateAndTime start);
+ Mantid::Types::DateAndTime start);
/// extracts the files from a mimedata object that have a .py extension
QStringList extractPyFiles(const QList<QUrl> &urlList) const;
diff --git a/qt/scientific_interfaces/Indirect/IndirectDataReductionTab.cpp b/qt/scientific_interfaces/Indirect/IndirectDataReductionTab.cpp
index df092a404dfa5a28bdc1e2b4101660dd131cb8fa..a4e7c8dbd931d847821a37304f3e626d3ae8a04d 100644
--- a/qt/scientific_interfaces/Indirect/IndirectDataReductionTab.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectDataReductionTab.cpp
@@ -10,6 +10,7 @@
using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
+using Mantid::Types::DateAndTime;
namespace {
Mantid::Kernel::Logger g_log("IndirectDataReductionTab");
diff --git a/qt/scientific_interfaces/Indirect/IndirectTab.cpp b/qt/scientific_interfaces/Indirect/IndirectTab.cpp
index 94bdd062473e79e6d7bb1919e62b11ee3a8bf415..217ae39a3eaa525260bfed6908d72ba706d324d8 100644
--- a/qt/scientific_interfaces/Indirect/IndirectTab.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectTab.cpp
@@ -17,6 +17,7 @@ using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
using namespace MantidQt::MantidWidgets;
+using Mantid::Types::DateAndTime;
namespace {
Mantid::Kernel::Logger g_log("IndirectTab");
diff --git a/qt/scientific_interfaces/Indirect/IndirectTab.h b/qt/scientific_interfaces/Indirect/IndirectTab.h
index 7f7c21067e1770b040e2f230697f0a3ffa5fd448..5fb7f6f7cebb3f6b312c954bffb5897ef4f8fa15 100644
--- a/qt/scientific_interfaces/Indirect/IndirectTab.h
+++ b/qt/scientific_interfaces/Indirect/IndirectTab.h
@@ -3,7 +3,7 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AnalysisDataService.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/System.h"
#include "MantidQtWidgets/Common/AlgorithmRunner.h"
#include "MantidQtWidgets/Common/BatchAlgorithmRunner.h"
@@ -211,8 +211,8 @@ protected:
/// Overidden by child class.
virtual bool validate() = 0;
- Mantid::Kernel::DateAndTime m_tabStartTime;
- Mantid::Kernel::DateAndTime m_tabEndTime;
+ Mantid::Types::DateAndTime m_tabStartTime;
+ Mantid::Types::DateAndTime m_tabEndTime;
std::string m_pythonExportWsName;
};
} // namespace CustomInterfaces
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
index adcc06d24cc7de47c75bbb683111c2a02d8a8e00..03840031dc52972b482b3b2e3be2970103a091c0 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
@@ -8,6 +8,7 @@
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/EmptyValues.h"
#include "MantidKernel/InstrumentInfo.h"
#include "MantidKernel/StringTokenizer.h"
@@ -56,14 +57,16 @@ getKeysFromTable(const Mantid::API::ITableWorkspace_sptr &tab) {
}
return keys;
}
-}
+} // namespace
namespace MantidQt {
namespace CustomInterfaces {
namespace MuonAnalysisHelper {
using namespace Mantid::Kernel;
+using namespace Mantid::Types;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
/**
* Sets double validator for specified field.
@@ -135,19 +138,21 @@ void printRunInfo(MatrixWorkspace_sptr runWs, std::ostringstream &out) {
const Run &run = runWs->run();
- Mantid::Kernel::DateAndTime start, end;
+ Mantid::Types::DateAndTime start, end;
// Add the start time for the run
out << "\nStart: ";
if (run.hasProperty("run_start")) {
- start = run.getProperty("run_start")->value();
+ start = DateAndTimeHelpers::createFromISO8601(
+ run.getProperty("run_start")->value());
out << start.toSimpleString();
}
// Add the end time for the run
out << "\nEnd: ";
if (run.hasProperty("run_end")) {
- end = run.getProperty("run_end")->value();
+ end = Mantid::Types::DateAndTimeHelpers::createFromISO8601(
+ run.getProperty("run_end")->value());
out << end.toSimpleString();
}
@@ -491,19 +496,20 @@ Workspace_sptr sumWorkspaces(const std::vector<Workspace_sptr> &workspaces) {
// Comparison function for dates
auto dateCompare = [](const std::string &first, const std::string &second) {
- return DateAndTime(first) < DateAndTime(second);
+ return DateAndTimeHelpers::createFromISO8601(first) <
+ DateAndTimeHelpers::createFromISO8601(second);
};
// Comparison function for doubles
- auto numericalCompare =
- [](const std::string &first, const std::string &second) {
- try {
- return boost::lexical_cast<double>(first) <
- boost::lexical_cast<double>(second);
- } catch (boost::bad_lexical_cast & /*e*/) {
- return false;
- }
- };
+ auto numericalCompare = [](const std::string &first,
+ const std::string &second) {
+ try {
+ return boost::lexical_cast<double>(first) <
+ boost::lexical_cast<double>(second);
+ } catch (boost::bad_lexical_cast & /*e*/) {
+ return false;
+ }
+ };
// Range of log values
auto runNumRange = findLogRange(workspaces, "run_number", numericalCompare);
@@ -1143,4 +1149,4 @@ getWorkspaceColors(const std::vector<Workspace_sptr> &workspaces) {
}
} // namespace MuonAnalysisHelper
} // namespace CustomInterfaces
-} // namespace Mantid
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisHelper.h b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.h
index 862581f5a7fd5eddcd13822248e1eb741ce0b024..436b726ddba420db38f74d5d122427588f416baa 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysisHelper.h
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.h
@@ -7,7 +7,7 @@
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidKernel/Logger.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include <QSettings>
#include <QVector>
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
index 397bb84e1a0d99a59c3d2e03cec74f1dcbf87477..e579b1f8682f014abf309ce26b94c520199bf04f 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
@@ -3,25 +3,26 @@
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
+#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidAPI/TableRow.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
#include "MantidQtWidgets/Common/UserSubWindow.h"
#include "MuonAnalysisHelper.h"
#include "MuonAnalysisResultTableCreator.h"
#include "MuonSequentialFitDialog.h"
-#include <boost/shared_ptr.hpp>
#include <boost/algorithm/string/predicate.hpp>
+#include <boost/shared_ptr.hpp>
#include <QFileInfo>
-#include <QLineEdit>
#include <QHash>
+#include <QLineEdit>
#include <QMessageBox>
#include <algorithm>
@@ -38,6 +39,7 @@ using namespace Mantid::API;
using namespace MantidQt::API;
using namespace MantidQt::MantidWidgets;
+using namespace Mantid::Types;
const std::string MuonAnalysisResultTableTab::WORKSPACE_POSTFIX("_Workspace");
const std::string MuonAnalysisResultTableTab::PARAMS_POSTFIX("_Parameters");
@@ -45,12 +47,17 @@ const QString MuonAnalysisResultTableTab::RUN_NUMBER_LOG("run_number");
const QString MuonAnalysisResultTableTab::RUN_START_LOG("run_start");
const QString MuonAnalysisResultTableTab::RUN_END_LOG("run_end");
const QStringList MuonAnalysisResultTableTab::NON_TIMESERIES_LOGS{
- MuonAnalysisResultTableTab::RUN_NUMBER_LOG, "group", "period",
- RUN_START_LOG, RUN_END_LOG, "sample_temp", "sample_magn_field"};
+ MuonAnalysisResultTableTab::RUN_NUMBER_LOG,
+ "group",
+ "period",
+ RUN_START_LOG,
+ RUN_END_LOG,
+ "sample_temp",
+ "sample_magn_field"};
/**
-* Constructor
-*/
+ * Constructor
+ */
MuonAnalysisResultTableTab::MuonAnalysisResultTableTab(Ui::MuonAnalysis &uiForm)
: m_uiForm(uiForm), m_savedLogsState(), m_unselectedFittings() {
// Connect the help button to the wiki page.
@@ -86,16 +93,16 @@ MuonAnalysisResultTableTab::MuonAnalysisResultTableTab(Ui::MuonAnalysis &uiForm)
}
/**
-* Muon Analysis Results Table Help (slot)
-*/
+ * Muon Analysis Results Table Help (slot)
+ */
void MuonAnalysisResultTableTab::helpResultsClicked() {
MantidQt::API::HelpWindow::showCustomInterface(
nullptr, QString("Muon_Analysis"), QString("results-table"));
}
/**
-* Select/Deselect all log values to be included in the table
-*/
+ * Select/Deselect all log values to be included in the table
+ */
void MuonAnalysisResultTableTab::selectAllLogs(bool state) {
if (state) {
for (int i = 0; i < m_uiForm.valueTable->rowCount(); i++) {
@@ -118,8 +125,8 @@ void MuonAnalysisResultTableTab::selectAllLogs(bool state) {
}
/**
-* Select/Deselect all fitting results to be included in the table
-*/
+ * Select/Deselect all fitting results to be included in the table
+ */
void MuonAnalysisResultTableTab::selectAllFittings(bool state) {
if (state) {
for (int i = 0; i < m_uiForm.fittingResultsTable->rowCount(); i++) {
@@ -484,12 +491,12 @@ void MuonAnalysisResultTableTab::populateTables() {
}
/**
-* Populates the items (log values) into their table.
-*
-* @param fittedWsList :: a workspace list containing ONLY the workspaces that
-* have parameter
-* tables associated with it.
-*/
+ * Populates the items (log values) into their table.
+ *
+ * @param fittedWsList :: a workspace list containing ONLY the workspaces that
+ * have parameter
+ * tables associated with it.
+ */
void MuonAnalysisResultTableTab::populateLogsAndValues(
const QStringList &fittedWsList) {
// A set of all the logs we've met in the workspaces
@@ -542,9 +549,11 @@ void MuonAnalysisResultTableTab::populateLogsAndValues(
} else if (logName == RUN_START_LOG || logName == RUN_END_LOG) {
wsLogValues[logName + " (text)"] =
QString::fromStdString(prop->value());
- const auto seconds = static_cast<double>(DateAndTime(prop->value())
- .totalNanoseconds()) *
- 1.e-9;
+ const auto seconds =
+ static_cast<double>(
+ DateAndTimeHelpers::createFromISO8601(prop->value())
+ .totalNanoseconds()) *
+ 1.e-9;
wsLogValues[logName + " (s)"] = seconds;
} else if (auto stringProp =
dynamic_cast<PropertyWithValue<std::string> *>(prop)) {
@@ -710,10 +719,10 @@ void MuonAnalysisResultTableTab::onCreateTableClicked() {
}
/**
-* Creates the table using the information selected by the user in the tables
-* @param multipleFits :: [input] Whether table is for multiple fits or one
-* single fit
-*/
+ * Creates the table using the information selected by the user in the tables
+ * @param multipleFits :: [input] Whether table is for multiple fits or one
+ * single fit
+ */
void MuonAnalysisResultTableTab::createTable(bool multipleFits) {
if (m_logValues.size() == 0) {
QMessageBox::information(this, "Mantid - Muon Analysis",
@@ -768,11 +777,11 @@ QStringList MuonAnalysisResultTableTab::getSelectedItemsToFit() {
}
/**
-* Get the user selected log file
-*
-* @return logsSelected :: A vector of QString's containing the logs that are
-* selected.
-*/
+ * Get the user selected log file
+ *
+ * @return logsSelected :: A vector of QString's containing the logs that are
+ * selected.
+ */
QStringList MuonAnalysisResultTableTab::getSelectedLogs() {
QStringList logsSelected;
for (int i = 0; i < m_uiForm.valueTable->rowCount(); i++) {
@@ -788,12 +797,12 @@ QStringList MuonAnalysisResultTableTab::getSelectedLogs() {
}
/**
-* Checks that the file name isn't been used, displays the appropriate message
-* and
-* then returns the name in which to save.
-*
-* @return name :: The name the results table should be created with.
-*/
+ * Checks that the file name isn't been used, displays the appropriate message
+ * and
+ * then returns the name in which to save.
+ *
+ * @return name :: The name the results table should be created with.
+ */
std::string MuonAnalysisResultTableTab::getFileName() {
std::string fileName(m_uiForm.tableName->text().toStdString());
@@ -816,6 +825,6 @@ std::string MuonAnalysisResultTableTab::getFileName() {
}
return fileName;
}
-}
-}
-}
+} // namespace Muon
+} // namespace CustomInterfaces
+} // namespace MantidQt
diff --git a/qt/scientific_interfaces/test/ALCLatestFileFinderTest.h b/qt/scientific_interfaces/test/ALCLatestFileFinderTest.h
index 65c5bf5a59498d53c4ceb5f1005b48aa3858bb26..a7e52ab512a4a6ac53274c8f2cb1af94d207f068 100644
--- a/qt/scientific_interfaces/test/ALCLatestFileFinderTest.h
+++ b/qt/scientific_interfaces/test/ALCLatestFileFinderTest.h
@@ -3,17 +3,17 @@
#include <cxxtest/TestSuite.h>
-#include "MantidKernel/make_unique.h"
-#include "MantidKernel/DateAndTime.h"
#include "../Muon/ALCLatestFileFinder.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/make_unique.h"
#include "MantidTestHelpers/ScopedFileHelper.h"
-#include <Poco/File.h>
#include <Poco/DateTime.h>
+#include <Poco/File.h>
using MantidQt::CustomInterfaces::ALCLatestFileFinder;
using ScopedFileHelper::ScopedFile;
-using Mantid::Kernel::DateAndTime;
+using namespace Mantid::Types;
/**
* Temporary directory that is deleted when it goes out of scope
@@ -62,14 +62,14 @@ public:
private:
/**
- * Generate a filename from supplied instrument, run number
- * @param directory :: [input] Name of directory to create files in (must
- * already exist)
- * @param instrument [input] :: instrument name
- * @param run [input] :: run number
- * @param extension [input] :: extension
- * @returns :: filename
- */
+ * Generate a filename from supplied instrument, run number
+ * @param directory :: [input] Name of directory to create files in (must
+ * already exist)
+ * @param instrument [input] :: instrument name
+ * @param run [input] :: run number
+ * @param extension [input] :: extension
+ * @returns :: filename
+ */
std::string createFileName(const std::string &directory,
const std::string &instrument,
const std::string &run,
@@ -87,10 +87,10 @@ private:
return stream.str();
}
/**
- * Set file's last modified time (resolution: nearest second)
- * @param path :: [input] Path to file
- * @param time :: [input] ISO8601 formatted time string
- */
+ * Set file's last modified time (resolution: nearest second)
+ * @param path :: [input] Path to file
+ * @param time :: [input] ISO8601 formatted time string
+ */
void adjustFileTime(const std::string &path,
const std::string &modifiedTime) {
// Make sure the file exists
@@ -99,7 +99,7 @@ private:
// Parse the time string and convert to Poco's format
// Ignore sub-second intervals
- DateAndTime time(modifiedTime);
+ DateAndTime time = DateAndTimeHelpers::createFromISO8601(modifiedTime);
Poco::DateTime pocoTime(time.year(), time.month(), time.day(), time.hour(),
time.minute(), time.second());
diff --git a/qt/scientific_interfaces/test/CMakeLists.txt b/qt/scientific_interfaces/test/CMakeLists.txt
index 7b23b0ef9358fca0765d0d2d5c87cdea9531e3a1..8f8c27b27220c66e26651a41fec8a749b5a8b3cd 100644
--- a/qt/scientific_interfaces/test/CMakeLists.txt
+++ b/qt/scientific_interfaces/test/CMakeLists.txt
@@ -55,6 +55,7 @@ if ( CXXTEST_FOUND )
DataObjects
Geometry
HistogramData
+ Types
Kernel
${Boost_LIBRARIES}
${POCO_LIBRARIES}
diff --git a/qt/scientific_interfaces/test/MDFLogValueFinderTest.h b/qt/scientific_interfaces/test/MDFLogValueFinderTest.h
index 500b7075a2647a629dff8964aaff10d85a6711c9..e1249d84ae0692666fdfc668c68ed86bb7f6f313 100644
--- a/qt/scientific_interfaces/test/MDFLogValueFinderTest.h
+++ b/qt/scientific_interfaces/test/MDFLogValueFinderTest.h
@@ -1,21 +1,22 @@
#ifndef MANTIDQT_CUSTOMINTERFACES_MDFLOGVALUEFINDERTEST_H_
#define MANTIDQT_CUSTOMINTERFACES_MDFLOGVALUEFINDERTEST_H_
+#include "../MultiDatasetFit/MDFLogValueFinder.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Run.h"
#include "MantidAPI/ScopedWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "../MultiDatasetFit/MDFLogValueFinder.h"
-#include <cxxtest/TestSuite.h>
#include <QStringList>
+#include <cxxtest/TestSuite.h>
+
+using namespace Mantid::Types;
using Mantid::API::MatrixWorkspace_sptr;
using Mantid::API::ScopedWorkspace;
using Mantid::API::WorkspaceFactory;
-using Mantid::Kernel::DateAndTime;
using Mantid::Kernel::Math::StatisticType;
using Mantid::Kernel::TimeSeriesProperty;
using MantidQt::CustomInterfaces::MDFLogValueFinder;
@@ -153,7 +154,7 @@ private:
for (size_t i = 0; i < 10; ++i) {
DateAndTime t;
const std::string &time = "2016-08-24T14:26:0" + std::to_string(i);
- t.setFromISO8601(time);
+ DateAndTimeHelpers::setFromISO8601(t, time);
times.push_back(t);
values.push_back(static_cast<double>(i + logValue));
}
diff --git a/qt/scientific_interfaces/test/MuonAnalysisHelperTest.h b/qt/scientific_interfaces/test/MuonAnalysisHelperTest.h
index e2c35c65ed2f05acea6137862987dc48725d4a37..e17a90dd13c998fe77358eff2b8c9b1eea052ff7 100644
--- a/qt/scientific_interfaces/test/MuonAnalysisHelperTest.h
+++ b/qt/scientific_interfaces/test/MuonAnalysisHelperTest.h
@@ -3,6 +3,7 @@
#include <cxxtest/TestSuite.h>
+#include "../Muon/MuonAnalysisHelper.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
@@ -12,8 +13,8 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/TimeSeriesProperty.h"
-#include "../Muon/MuonAnalysisHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
using namespace MantidQt::CustomInterfaces::MuonAnalysisHelper;
@@ -21,6 +22,7 @@ using namespace MantidQt::CustomInterfaces::MuonAnalysisHelper;
using namespace Mantid;
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using namespace Mantid::Types;
/// This is a wrapper for the ADS that automatically clears itself on
/// destruction
@@ -130,8 +132,8 @@ public:
WorkspaceCreationHelper::create2DWorkspace123(1, 3);
MatrixWorkspace_sptr ws3 =
WorkspaceCreationHelper::create2DWorkspace123(1, 3);
- DateAndTime start{"2015-12-23T15:32:40Z"};
- DateAndTime end{"2015-12-24T09:00:00Z"};
+ auto start = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z");
+ auto end = DateAndTimeHelpers::createFromISO8601("2015-12-24T09:00:00Z");
addLog(ws1, "run_start", start.toSimpleString());
addLog(ws1, "run_end", end.toSimpleString());
addLog(ws1, "run_number", "15189");
@@ -182,8 +184,8 @@ public:
void test_replaceLogValue() {
ScopedWorkspace ws(createWs("MUSR", 15189));
- DateAndTime start1{"2015-12-23T15:32:40Z"};
- DateAndTime start2{"2014-12-23T15:32:40Z"};
+ auto start1 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z");
+ auto start2 = DateAndTimeHelpers::createFromISO8601("2014-12-23T15:32:40Z");
addLog(ws.retrieve(), "run_start", start1.toSimpleString());
replaceLogValue(ws.name(), "run_start", start2.toSimpleString());
auto times = findLogValues(ws.retrieve(), "run_start");
@@ -194,8 +196,8 @@ public:
void test_findLogValues() {
Workspace_sptr ws1 = createWs("MUSR", 15189);
Workspace_sptr ws2 = createWs("MUSR", 15190);
- DateAndTime start1{"2015-12-23T15:32:40Z"};
- DateAndTime start2{"2014-12-23T15:32:40Z"};
+ auto start1 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z");
+ auto start2 = DateAndTimeHelpers::createFromISO8601("2014-12-23T15:32:40Z");
addLog(ws1, "run_start", start1.toSimpleString());
addLog(ws2, "run_start", start2.toSimpleString());
auto groupWS = groupWorkspaces({ws1, ws2});
@@ -203,21 +205,23 @@ public:
auto badLogs = findLogValues(groupWS, "not_present");
auto singleStart = findLogValues(ws1, "run_start");
TS_ASSERT_EQUALS(2, starts.size());
- TS_ASSERT_EQUALS(start1, starts[0]);
- TS_ASSERT_EQUALS(start2, starts[1]);
+ TS_ASSERT_EQUALS(start1.toSimpleString(), starts[0]);
+ TS_ASSERT_EQUALS(start2.toSimpleString(), starts[1]);
TS_ASSERT_EQUALS(0, badLogs.size());
TS_ASSERT_EQUALS(1, singleStart.size());
- TS_ASSERT_EQUALS(start1, singleStart[0]);
+ TS_ASSERT_EQUALS(start1.toSimpleString(), singleStart[0]);
}
void test_findLogRange_singleWS() {
Workspace_sptr ws = createWs("MUSR", 15189);
- DateAndTime start{"2015-12-23T15:32:40Z"};
+ auto start = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z");
addLog(ws, "run_start", start.toSimpleString());
- auto range = findLogRange(ws, "run_start", [](const std::string &first,
- const std::string &second) {
- return DateAndTime(first) < DateAndTime(second);
- });
+ auto range =
+ findLogRange(ws, "run_start",
+ [](const std::string &first, const std::string &second) {
+ return DateAndTimeHelpers::createFromISO8601(first) <
+ DateAndTimeHelpers::createFromISO8601(second);
+ });
TS_ASSERT_EQUALS(range.first, start.toSimpleString());
TS_ASSERT_EQUALS(range.second, start.toSimpleString());
}
@@ -225,15 +229,16 @@ public:
void test_findLogRange_groupWS() {
Workspace_sptr ws1 = createWs("MUSR", 15189);
Workspace_sptr ws2 = createWs("MUSR", 15190);
- DateAndTime start1{"2015-12-23T15:32:40Z"};
- DateAndTime start2{"2014-12-23T15:32:40Z"};
+ auto start1 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z");
+ auto start2 = DateAndTimeHelpers::createFromISO8601("2014-12-23T15:32:40Z");
addLog(ws1, "run_start", start1.toSimpleString());
addLog(ws2, "run_start", start2.toSimpleString());
auto groupWS = groupWorkspaces({ws1, ws2});
auto range =
findLogRange(groupWS, "run_start",
[](const std::string &first, const std::string &second) {
- return DateAndTime(first) < DateAndTime(second);
+ return DateAndTimeHelpers::createFromISO8601(first) <
+ DateAndTimeHelpers::createFromISO8601(second);
});
TS_ASSERT_EQUALS(range.first, start2.toSimpleString());
TS_ASSERT_EQUALS(range.second, start1.toSimpleString());
@@ -242,15 +247,16 @@ public:
void test_findLogRange_vectorOfWorkspaces() {
Workspace_sptr ws1 = createWs("MUSR", 15189);
Workspace_sptr ws2 = createWs("MUSR", 15190);
- DateAndTime start1{"2015-12-23T15:32:40Z"};
- DateAndTime start2{"2014-12-23T15:32:40Z"};
+ auto start1 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z");
+ auto start2 = DateAndTimeHelpers::createFromISO8601("2014-12-23T15:32:40Z");
addLog(ws1, "run_start", start1.toSimpleString());
addLog(ws2, "run_start", start2.toSimpleString());
std::vector<Workspace_sptr> workspaces = {ws1, ws2};
auto range =
findLogRange(workspaces, "run_start",
[](const std::string &first, const std::string &second) {
- return DateAndTime(first) < DateAndTime(second);
+ return DateAndTimeHelpers::createFromISO8601(first) <
+ DateAndTimeHelpers::createFromISO8601(second);
});
TS_ASSERT_EQUALS(range.first, start2.toSimpleString());
TS_ASSERT_EQUALS(range.second, start1.toSimpleString());
@@ -262,7 +268,8 @@ public:
auto timeRange =
findLogRange(ws, "run_start",
[](const std::string &first, const std::string &second) {
- return DateAndTime(first) < DateAndTime(second);
+ return DateAndTimeHelpers::createFromISO8601(first) <
+ DateAndTimeHelpers::createFromISO8601(second);
});
TS_ASSERT_EQUALS(timeRange.first, "");
TS_ASSERT_EQUALS(timeRange.second, "");
@@ -296,10 +303,13 @@ public:
void test_appendTimeSeriesLogs() {
Workspace_sptr ws1 = createWs("MUSR", 15189);
Workspace_sptr ws2 = createWs("MUSR", 15190);
- const DateAndTime time1{"2015-12-23T15:32:40Z"},
- time2{"2015-12-23T15:32:41Z"}, time3{"2015-12-23T15:32:42Z"},
- time4{"2015-12-23T15:32:43Z"}, time5{"2015-12-23T15:32:44Z"},
- time6{"2015-12-23T15:32:45Z"};
+ const DateAndTime
+ time1 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:40Z"),
+ time2 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:41Z"),
+ time3 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:42Z"),
+ time4 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:43Z"),
+ time5 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:44Z"),
+ time6 = DateAndTimeHelpers::createFromISO8601("2015-12-23T15:32:45Z");
const double value1(1), value2(2), value3(3), value4(4), value5(5),
value6(6);
const std::string logName = "TSLog";
@@ -732,7 +742,7 @@ private:
// Adds a time series log to the workspace
void addTimeSeriesLog(const Workspace_sptr &ws, const std::string &logName,
- const std::vector<Mantid::Kernel::DateAndTime> ×,
+ const std::vector<Mantid::Types::DateAndTime> ×,
const std::vector<double> &values) {
TS_ASSERT_EQUALS(times.size(), values.size());
auto matrixWS = boost::dynamic_pointer_cast<MatrixWorkspace>(ws);
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h
index 5ad38d620e3f73552ea60ced920d10f3b8ab55be..9b605b40d19d563738da72568a78e227fc7dc9c6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/MantidTreeWidgetItem.h
@@ -2,7 +2,7 @@
#define MANTIDTREEWIDGETITEM_H
#include "MantidQtWidgets/Common/DllOption.h"
-#include <MantidKernel/DateAndTime.h>
+#include <MantidTypes/DateAndTime.h>
#include <MantidQtWidgets/Common/WorkspaceObserver.h>
#include <QTreeWidgetItem>
@@ -24,7 +24,7 @@ public:
private:
bool operator<(const QTreeWidgetItem &other) const override;
MantidTreeWidget *m_parent;
- static Mantid::Kernel::DateAndTime getLastModified(const QTreeWidgetItem *);
+ static Mantid::Types::DateAndTime getLastModified(const QTreeWidgetItem *);
int m_sortPos;
};
}
diff --git a/qt/widgets/common/src/AlgorithmDialog.cpp b/qt/widgets/common/src/AlgorithmDialog.cpp
index 453b561cf38115caa8343e81f887c2c120d396e7..8a444acc89d8023487735b70792bb3dfb5442e66 100644
--- a/qt/widgets/common/src/AlgorithmDialog.cpp
+++ b/qt/widgets/common/src/AlgorithmDialog.cpp
@@ -1,25 +1,24 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/IWorkspaceProperty.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidKernel/IPropertySettings.h"
#include "MantidKernel/Logger.h"
#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
-#include "MantidQtWidgets/Common/MantidWidget.h"
-#include "MantidQtWidgets/Common/HelpWindow.h"
#include "MantidQtWidgets/Common/FilePropertyWidget.h"
+#include "MantidQtWidgets/Common/HelpWindow.h"
+#include "MantidQtWidgets/Common/MantidWidget.h"
+#include <QCheckBox>
+#include <QComboBox>
+#include <QHBoxLayout>
#include <QIcon>
#include <QLabel>
-#include <QMessageBox>
#include <QLineEdit>
-#include <QComboBox>
-#include <QCheckBox>
+#include <QMessageBox>
#include <QPushButton>
-#include <QHBoxLayout>
-#include <QCheckBox>
#include <QtGui>
#include <Poco/ActiveResult.h>
@@ -27,7 +26,6 @@
using namespace MantidQt::API;
using namespace Mantid::Kernel::DateAndTimeHelpers;
using Mantid::API::IAlgorithm;
-using Mantid::Kernel::DateAndTime;
namespace {
Mantid::Kernel::Logger g_log("AlgorithmDialog");
@@ -478,10 +476,10 @@ bool AlgorithmDialog::isWidgetEnabled(const QString &propName) const {
return true;
/**
- * The control is disabled if
- * (1) It is contained in the disabled list or
- * (2) A user passed a value into the dialog
- */
+ * The control is disabled if
+ * (1) It is contained in the disabled list or
+ * (2) A user passed a value into the dialog
+ */
return !(m_disabled.contains(propName) ||
m_python_arguments.contains(propName));
@@ -820,10 +818,10 @@ void AlgorithmDialog::parse() {
//-------------------------------------------------------------------------------------------------
/**
- * Set a list of values for the properties
- * @param presetValues :: A string containing a list of "name=value" pairs with
+ * Set a list of values for the properties
+ * @param presetValues :: A string containing a list of "name=value" pairs with
* each separated by an '|' character
- */
+ */
void AlgorithmDialog::setPresetValues(
const QHash<QString, QString> &presetValues) {
if (presetValues.isEmpty())
diff --git a/qt/widgets/common/src/CatalogHelper.cpp b/qt/widgets/common/src/CatalogHelper.cpp
index cf39d7df7afa007d3b0faea774a3b9d9fb1cd64c..e34ebad2ef4b9557ecffc93fdc26072e5c9cf3c2 100644
--- a/qt/widgets/common/src/CatalogHelper.cpp
+++ b/qt/widgets/common/src/CatalogHelper.cpp
@@ -1,13 +1,13 @@
-#include "MantidAPI/CatalogManager.h"
#include "MantidQtWidgets/Common/CatalogHelper.h"
+#include "MantidAPI/CatalogManager.h"
+#include "MantidKernel/DateAndTimeHelpers.h"
#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "MantidQtWidgets/Common/InterfaceManager.h"
-#include "MantidKernel/DateAndTime.h"
-#include <boost/algorithm/string/regex.hpp>
#include <Poco/ActiveResult.h>
#include <QCoreApplication>
#include <QTime>
+#include <boost/algorithm/string/regex.hpp>
namespace MantidQt {
namespace MantidWidgets {
@@ -238,7 +238,8 @@ time_t CatalogHelper::getTimevalue(const std::string &inputDate) {
std::string isoDate = dateSegments.at(2) + "-" + dateSegments.at(1) + "-" +
dateSegments.at(0) + " 0:00:00.000";
// Return the date as time_t value.
- return Mantid::Kernel::DateAndTime(isoDate).to_time_t();
+ return Mantid::Types::DateAndTimeHelpers::createFromISO8601(isoDate)
+ .to_time_t();
}
/**
diff --git a/qt/widgets/common/src/MantidTreeWidgetItem.cpp b/qt/widgets/common/src/MantidTreeWidgetItem.cpp
index 0586c14d34cda5ad38ef65af2caa9ac89890eb58..65034216da3ddc9aa0aec1f655873e1d0d370d8b 100644
--- a/qt/widgets/common/src/MantidTreeWidgetItem.cpp
+++ b/qt/widgets/common/src/MantidTreeWidgetItem.cpp
@@ -1,30 +1,31 @@
#include "MantidQtWidgets/Common/MantidTreeWidgetItem.h"
#include "MantidQtWidgets/Common/MantidTreeWidget.h"
-#include <MantidAPI/Workspace.h>
#include "MantidAPI/WorkspaceHistory.h"
+#include <MantidAPI/Workspace.h>
using namespace Mantid::Kernel;
using namespace Mantid::API;
+using Mantid::Types::DateAndTime;
namespace MantidQt {
namespace MantidWidgets {
/**Constructor.
-* Must be passed its parent MantidTreeWidget, to facilitate correct sorting.
-*/
+ * Must be passed its parent MantidTreeWidget, to facilitate correct sorting.
+ */
MantidTreeWidgetItem::MantidTreeWidgetItem(MantidTreeWidget *parent)
: QTreeWidgetItem(parent), m_parent(parent), m_sortPos(0) {}
/**Constructor.
-* Must be passed its parent MantidTreeWidget, to facilitate correct sorting.
-*/
+ * Must be passed its parent MantidTreeWidget, to facilitate correct sorting.
+ */
MantidTreeWidgetItem::MantidTreeWidgetItem(QStringList list,
MantidTreeWidget *parent)
: QTreeWidgetItem(list), m_parent(parent), m_sortPos(0) {}
/**Overidden operator.
-* Must be passed its parent MantidTreeWidget, to facilitate correct sorting.
-*/
+ * Must be passed its parent MantidTreeWidget, to facilitate correct sorting.
+ */
bool MantidTreeWidgetItem::operator<(const QTreeWidgetItem &other) const {
// If this and/or other has been set to have a Qt::UserRole, then
// it has an accompanying sort order that we must maintain, no matter
@@ -85,9 +86,9 @@ bool MantidTreeWidgetItem::operator<(const QTreeWidgetItem &other) const {
}
/**Finds the date and time of the last modification made to the workspace who's
-* details
-* are found in the given QTreeWidgetItem.
-*/
+ * details
+ * are found in the given QTreeWidgetItem.
+ */
DateAndTime MantidTreeWidgetItem::getLastModified(const QTreeWidgetItem *item) {
QVariant userData = item->data(0, Qt::UserRole);
if (userData.isNull())
@@ -102,5 +103,5 @@ DateAndTime MantidTreeWidgetItem::getLastModified(const QTreeWidgetItem *item) {
const auto lastAlgHist = wsHist.getAlgorithmHistory(indexOfLast);
return lastAlgHist->executionDate();
}
-}
-}
+} // namespace MantidWidgets
+} // namespace MantidQt
diff --git a/qt/widgets/common/src/SlitCalculator.cpp b/qt/widgets/common/src/SlitCalculator.cpp
index 7a082649280610d4568bd4ebab87912870bfe1f8..3fe12802c7ba52373e6f3b62817f0056777690d6 100644
--- a/qt/widgets/common/src/SlitCalculator.cpp
+++ b/qt/widgets/common/src/SlitCalculator.cpp
@@ -29,7 +29,7 @@ SlitCalculator::~SlitCalculator() {}
void SlitCalculator::setInstrument(std::string instrumentName) {
// we want to get the most up-to-date definition, so we use the current
// date/time
- auto date = Mantid::Kernel::DateAndTime::getCurrentTime().toISO8601String();
+ auto date = Mantid::Types::DateAndTime::getCurrentTime().toISO8601String();
// find the full path to the definition file
auto filename =
Mantid::API::ExperimentInfo::getInstrumentFilename(instrumentName, date);
diff --git a/qt/widgets/common/test/CMakeLists.txt b/qt/widgets/common/test/CMakeLists.txt
index 435590ad1cbe4259ea06b7c2750c8f78fe6a04ee..16f039268fbfb0fa2f091afa1e30efcd51428db3 100644
--- a/qt/widgets/common/test/CMakeLists.txt
+++ b/qt/widgets/common/test/CMakeLists.txt
@@ -20,6 +20,7 @@ if ( CXXTEST_FOUND )
DataObjects
Geometry
HistogramData
+ Types
Kernel
${QT_LIBRARIES}
${QWT_LIBRARIES}
diff --git a/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp b/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
index 1463d688ffd7d14c6bd1ee0bec02fca85b02b950..d7e9524e339701e17b8d0ff6dda9a126e238ad94 100644
--- a/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
+++ b/qt/widgets/plugins/algorithm_dialogs/src/StartLiveDataDialog.cpp
@@ -10,7 +10,7 @@
#include <QtCore/qstringlist.h>
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/LiveListenerFactory.h"
-#include "MantidKernel/DateAndTime.h"
+#include "MantidTypes/DateAndTime.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/InstrumentInfo.h"
@@ -22,7 +22,7 @@ using namespace MantidQt::CustomDialogs;
using namespace MantidQt::API;
using Mantid::API::AlgorithmManager;
using Mantid::API::Algorithm_sptr;
-using Mantid::Kernel::DateAndTime;
+using Mantid::Types::DateAndTime;
using Mantid::Kernel::ConfigService;
namespace {