diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h index ea6bad10efd226a41ddefa545920591718fbfc2b..087a426114da177ee58857e8800ef9e99b294dc0 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h @@ -52,8 +52,9 @@ public: protected: API::MatrixWorkspace_sptr execWS2D(const API::MatrixWorkspace &ws1, const API::MatrixWorkspace &ws2); - API::MatrixWorkspace_sptr execEvent(const DataObjects::EventWorkspace &event_ws1, - const DataObjects::EventWorkspace &event_ws2); + API::MatrixWorkspace_sptr + execEvent(const DataObjects::EventWorkspace &event_ws1, + const DataObjects::EventWorkspace &event_ws2); using Mantid::API::Algorithm::validateInputs; void validateInputs(const API::MatrixWorkspace &ws1, diff --git a/Framework/Algorithms/src/AppendSpectra.cpp b/Framework/Algorithms/src/AppendSpectra.cpp index fa86eae8201e2d0858309b670ff9715968ef11f9..8b76af15f727504603e80e6a7b740504abd78bc4 100644 --- a/Framework/Algorithms/src/AppendSpectra.cpp +++ b/Framework/Algorithms/src/AppendSpectra.cpp @@ -60,8 +60,10 @@ void AppendSpectra::exec() { // Retrieve the input workspaces MatrixWorkspace_const_sptr ws1 = getProperty("InputWorkspace1"); MatrixWorkspace_const_sptr ws2 = getProperty("InputWorkspace2"); - DataObjects::EventWorkspace_const_sptr event_ws1 = boost::dynamic_pointer_cast<const EventWorkspace>(ws1); - DataObjects::EventWorkspace_const_sptr event_ws2 = boost::dynamic_pointer_cast<const EventWorkspace>(ws2); + DataObjects::EventWorkspace_const_sptr event_ws1 = + boost::dynamic_pointer_cast<const EventWorkspace>(ws1); + DataObjects::EventWorkspace_const_sptr event_ws2 = + boost::dynamic_pointer_cast<const EventWorkspace>(ws2); // Make sure that we are not mis-matching EventWorkspaces and other types of // workspaces diff --git a/Framework/Algorithms/src/ConjoinWorkspaces.cpp b/Framework/Algorithms/src/ConjoinWorkspaces.cpp index 29ba6e01b9ef491074259434f42b4ce4f1ad0df4..f7397666c02c1d483fe920b74f5bb495398caf57 100644 --- a/Framework/Algorithms/src/ConjoinWorkspaces.cpp +++ b/Framework/Algorithms/src/ConjoinWorkspaces.cpp @@ -46,8 +46,10 @@ void ConjoinWorkspaces::exec() { // Retrieve the input workspaces MatrixWorkspace_const_sptr ws1 = getProperty("InputWorkspace1"); MatrixWorkspace_const_sptr ws2 = getProperty("InputWorkspace2"); - DataObjects::EventWorkspace_const_sptr event_ws1 = boost::dynamic_pointer_cast<const EventWorkspace>(ws1); - DataObjects::EventWorkspace_const_sptr event_ws2 = boost::dynamic_pointer_cast<const EventWorkspace>(ws2); + DataObjects::EventWorkspace_const_sptr event_ws1 = + boost::dynamic_pointer_cast<const EventWorkspace>(ws1); + DataObjects::EventWorkspace_const_sptr event_ws2 = + boost::dynamic_pointer_cast<const EventWorkspace>(ws2); // Make sure that we are not mis-matching EventWorkspaces and other types of // workspaces diff --git a/Framework/Algorithms/src/WorkspaceJoiners.cpp b/Framework/Algorithms/src/WorkspaceJoiners.cpp index 0131b2e4f1f72781c1d1c6523f6d59d29aa76440..fd9cd712e14bb800565009fb321cb204d6809241 100644 --- a/Framework/Algorithms/src/WorkspaceJoiners.cpp +++ b/Framework/Algorithms/src/WorkspaceJoiners.cpp @@ -118,8 +118,9 @@ MatrixWorkspace_sptr WorkspaceJoiners::execWS2D(const MatrixWorkspace &ws1, * @throw std::invalid_argument If the input workspaces do not meet the * requirements of this algorithm */ -MatrixWorkspace_sptr WorkspaceJoiners::execEvent(const DataObjects::EventWorkspace &event_ws1, - const DataObjects::EventWorkspace &event_ws2) { +MatrixWorkspace_sptr +WorkspaceJoiners::execEvent(const DataObjects::EventWorkspace &event_ws1, + const DataObjects::EventWorkspace &event_ws2) { // Create the output workspace const size_t totalHists = event_ws1.getNumberHistograms() + event_ws2.getNumberHistograms();