From a9d530aee2912cf54b4892589230f318b47d9c66 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Fri, 16 Oct 2015 17:32:27 +0100
Subject: [PATCH] Re #14022 Mean Clang
---
.../api/src/Exports/MatrixWorkspace.cpp | 31 ++++++++-----------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index b753fff6c5e..f7784bae01b 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -15,8 +15,6 @@
#include <boost/python/overloads.hpp>
#include <boost/python/register_ptr_to_python.hpp>
-
-
using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -86,15 +84,16 @@ void setSpectrumFromPyObject(MatrixWorkspace &self, data_modifier accessor,
* @param self :: A reference to the calling object
* @param value :: The python pointer to the workspace to set
*/
-void setMonitorWorkspace(MatrixWorkspace &self,const boost::python::object &value){
+void setMonitorWorkspace(MatrixWorkspace &self,
+ const boost::python::object &value) {
- MatrixWorkspace_sptr monWS =
- boost::dynamic_pointer_cast<MatrixWorkspace>
- (Mantid::PythonInterface::ExtractWorkspace(value)());
- if(monWS){
- if(monWS.get() == &self){
- throw std::runtime_error("To avoid memory leak, monitor workspace"
- " can not be the same workspace as the host workspace");
+ MatrixWorkspace_sptr monWS = boost::dynamic_pointer_cast<MatrixWorkspace>(
+ Mantid::PythonInterface::ExtractWorkspace(value)());
+ if (monWS) {
+ if (monWS.get() == &self) {
+ throw std::runtime_error(
+ "To avoid memory leak, monitor workspace"
+ " can not be the same workspace as the host workspace");
}
}
self.setMonitorWorkspace(monWS);
@@ -104,12 +103,11 @@ void setMonitorWorkspace(MatrixWorkspace &self,const boost::python::object &valu
*
* @param self :: A reference to the calling object
*/
-void clearMonitorWorkspace(MatrixWorkspace &self){
+void clearMonitorWorkspace(MatrixWorkspace &self) {
MatrixWorkspace_sptr monWS;
self.setMonitorWorkspace(monWS);
}
-
/**
* Set the X values from an python array-style object
* @param self :: A reference to the calling object
@@ -179,7 +177,6 @@ Mantid::API::Run &getSampleDetailsDeprecated(MatrixWorkspace &self) {
}
}
-
/** Python exports of the Mantid::API::MatrixWorkspace class. */
void export_MatrixWorkspace() {
/// Typedef to remove const qualifier on input detector shared_ptr. See
@@ -353,20 +350,18 @@ void export_MatrixWorkspace() {
"Performs a comparison operation on two workspaces, using the "
"CheckWorkspacesMatch algorithm")
//--------- monitor workspace --------------------------------------
- .def("getMonitorWorkspace",&MatrixWorkspace::monitorWorkspace,
+ .def("getMonitorWorkspace", &MatrixWorkspace::monitorWorkspace,
args("self"),
"Return internal monitor workspace bound to current workspace.")
- .def("setMonitorWorkspace",&setMonitorWorkspace,
+ .def("setMonitorWorkspace", &setMonitorWorkspace,
args("self", "MonitorWS"),
"Set specified workspace as monitor workspace for"
"current workspace. "
"Note: The workspace does not have to contain monitors though "
"some subsequent algorithms may expect it to be "
"monitor workspace later.")
- .def("clearMonitorWorkspace",&clearMonitorWorkspace,
- args("self"),
+ .def("clearMonitorWorkspace", &clearMonitorWorkspace, args("self"),
"Forget about monitor workspace, attached to the current workspace");
-
RegisterWorkspacePtrToPython<MatrixWorkspace>();
}
--
GitLab