diff --git a/Framework/Algorithms/src/AppendSpectra.cpp b/Framework/Algorithms/src/AppendSpectra.cpp index d9abc25a80bc0bfaad57c399a2a3f546b6c09533..fa28c4f88f8005d8d98fca69b86e9fce5d0e62c9 100644 --- a/Framework/Algorithms/src/AppendSpectra.cpp +++ b/Framework/Algorithms/src/AppendSpectra.cpp @@ -88,20 +88,21 @@ void AppendSpectra::exec() { if (event_ws1 && event_ws2) { // Both are event workspaces. Use the special method - DataObjects::EventWorkspace_sptr e_output = this->execEvent(*event_ws1, *event_ws2); + DataObjects::EventWorkspace_sptr e_output = + this->execEvent(*event_ws1, *event_ws2); for (int i = 1; i < number; i++) { e_output = this->execEvent(*e_output, *event_ws2); } output = boost::dynamic_pointer_cast<MatrixWorkspace>(e_output); - } - else {// So it is a workspace 2D. + } else { // So it is a workspace 2D. // The only restriction, even with ValidateInputs=false if (ws1->blocksize() != ws2->blocksize()) - throw std::runtime_error( "Workspace2D's must have the same number of bins."); + throw std::runtime_error( + "Workspace2D's must have the same number of bins."); output = execWS2D(*ws1, *ws2); for (int i = 1; i < number; i++) { - output = execWS2D(*output, *ws2); + output = execWS2D(*output, *ws2); } } @@ -113,7 +114,6 @@ void AppendSpectra::exec() { boost::dynamic_pointer_cast<MatrixWorkspace>(output)); } - /** If there is an overlap in spectrum numbers between ws1 and ws2, * then the spectrum numbers are reset as a simple 1-1 correspondence * with the workspace index. diff --git a/Framework/Algorithms/test/AppendSpectraTest.h b/Framework/Algorithms/test/AppendSpectraTest.h index 271e43d8225258ea57c713cca6c69ef97b2de2b7..2b43a0d444ae5b0ddf7af9746d3bc4e5c6d42cea 100644 --- a/Framework/Algorithms/test/AppendSpectraTest.h +++ b/Framework/Algorithms/test/AppendSpectraTest.h @@ -178,7 +178,7 @@ public: } //---------------------------------------------------------------------------------------------- - void doTest(bool event, bool combineLogs=false, int number=1) { + void doTest(bool event, bool combineLogs = false, int number = 1) { MatrixWorkspace_sptr ws1, ws2, out; int numBins = 20; @@ -247,7 +247,7 @@ public: void test_events() { doTest(true); } - void test_number_events() {doTest(true, true, 3);} + void test_number_events() { doTest(true, true, 3); } void test_2D() { doTest(false); }