Skip to content

Commit

Permalink
Re #5564 Applied clang-format patch
Browse files Browse the repository at this point in the history
  • Loading branch information
josephframsay committed Jul 18, 2017
1 parent 58b1905 commit 5ee2168
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Framework/Algorithms/src/WorkspaceJoiners.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,17 @@ MatrixWorkspace_sptr WorkspaceJoiners::execEvent() {
*/
void WorkspaceJoiners::validateInputs(const MatrixWorkspace &ws1,
const MatrixWorkspace &ws2) {
// Workspaces with point data are allowed to have different binning
if (ws1.isHistogramData() || ws2.isHistogramData()) {
// This is the full check for common binning
if (!WorkspaceHelpers::commonBoundaries(ws1) ||
!WorkspaceHelpers::commonBoundaries(ws2)) {
g_log.error(
"Both input workspaces must have common binning for all their spectra");
throw std::invalid_argument(
"Both input workspaces must have common binning for all their spectra");
}
}
// Workspaces with point data are allowed to have different binning
if (ws1.isHistogramData() || ws2.isHistogramData()) {
// This is the full check for common binning
if (!WorkspaceHelpers::commonBoundaries(ws1) ||
!WorkspaceHelpers::commonBoundaries(ws2)) {
g_log.error("Both input workspaces must have common binning for all "
"their spectra");
throw std::invalid_argument("Both input workspaces must have common "
"binning for all their spectra");
}
}

if (ws1.getInstrument()->getName() != ws2.getInstrument()->getName()) {
const std::string message("The input workspaces are not compatible because "
Expand Down

0 comments on commit 5ee2168

Please sign in to comment.