Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
1dae7e1f
Commit
1dae7e1f
authored
6 years ago
by
Peterson, Peter
Browse files
Options
Downloads
Patches
Plain Diff
Fix broken merge
parent
d4e950ac
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
+5
-4
5 additions, 4 deletions
...nterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
with
5 additions
and
4 deletions
Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
+
5
−
4
View file @
1dae7e1f
...
...
@@ -41,11 +41,12 @@ template <typename TYPE>
tuple
pyTimeAverageValueAndStdDev
(
const
TimeSeriesProperty
<
TYPE
>
&
self
)
{
const
std
::
pair
<
double
,
double
>
value
=
self
.
timeAverageValueAndStdDev
();
return
make_tuple
(
value
.
first
,
value
.
second
);
}
// Call the dtype helper function
template
<
typename
TYPE
>
std
::
string
dtype
(
TimeSeriesProperty
<
TYPE
>
&
self
)
{
return
Mantid
::
PythonInterface
::
Converters
::
dtype
(
self
);
}
// Call the dtype helper function
template
<
typename
TYPE
>
std
::
string
dtype
(
TimeSeriesProperty
<
TYPE
>
&
self
)
{
return
Mantid
::
PythonInterface
::
Converters
::
dtype
(
self
);
}
// Macro to reduce copy-and-paste
#define EXPORT_TIMESERIES_PROP(TYPE, Prefix) \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment