Skip to content
Snippets Groups Projects
Commit 1dae7e1f authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Fix broken merge

parent d4e950ac
No related branches found
No related tags found
No related merge requests found
...@@ -41,11 +41,12 @@ template <typename TYPE> ...@@ -41,11 +41,12 @@ template <typename TYPE>
tuple pyTimeAverageValueAndStdDev(const TimeSeriesProperty<TYPE> &self) { tuple pyTimeAverageValueAndStdDev(const TimeSeriesProperty<TYPE> &self) {
const std::pair<double, double> value = self.timeAverageValueAndStdDev(); const std::pair<double, double> value = self.timeAverageValueAndStdDev();
return make_tuple(value.first, value.second); return make_tuple(value.first, value.second);
}
// Call the dtype helper function // Call the dtype helper function
template <typename TYPE> std::string dtype(TimeSeriesProperty<TYPE> & self) { template <typename TYPE> std::string dtype(TimeSeriesProperty<TYPE> &self) {
return Mantid::PythonInterface::Converters::dtype(self); return Mantid::PythonInterface::Converters::dtype(self);
} }
// Macro to reduce copy-and-paste // Macro to reduce copy-and-paste
#define EXPORT_TIMESERIES_PROP(TYPE, Prefix) \ #define EXPORT_TIMESERIES_PROP(TYPE, Prefix) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment