Re #5564 Combined the two validateInputs method with default parameter

mantidproject · Jul 19, 2017 · e453268 · e453268
1 parent 57b8369
commit e453268
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
@@ -56,9 +56,7 @@ class DLLExport WorkspaceJoiners : public API::Algorithm {
 
   using Mantid::API::Algorithm::validateInputs;
   void validateInputs(const API::MatrixWorkspace &ws1,
-                      const API::MatrixWorkspace &ws2, const bool checkBinning);
-  void validateInputs(const API::MatrixWorkspace &ws1,
-                      const API::MatrixWorkspace &ws2);
+                      const API::MatrixWorkspace &ws2, const bool checkBinning = true);
   void getMinMax(const API::MatrixWorkspace &ws, specnum_t &min,
                  specnum_t &max);
 

diff --git a/Framework/Algorithms/src/WorkspaceJoiners.cpp b/Framework/Algorithms/src/WorkspaceJoiners.cpp
@@ -170,7 +170,7 @@ MatrixWorkspace_sptr WorkspaceJoiners::execEvent() {
 *  @param ws1 :: The first input workspace
 *  @param ws2 :: The second input workspace
 *  @param checkBinning :: A flag for whether to check that the workspaces have
-* compatible binning
+* compatible binning (default true)
 *  @throw std::invalid_argument If the workspaces are not compatible
 */
 void Mantid::Algorithms::WorkspaceJoiners::validateInputs(
@@ -222,18 +222,6 @@ void Mantid::Algorithms::WorkspaceJoiners::validateInputs(
   }
 }
 
-/** Checks that the two input workspace have common binning & size, the same
- * instrument & unit.
- *  Also calls the checkForOverlap method.
- *  @param ws1 :: The first input workspace
- *  @param ws2 :: The second input workspace
- *  @throw std::invalid_argument If the workspaces are not compatible
- */
-void WorkspaceJoiners::validateInputs(const MatrixWorkspace &ws1,
-                                      const MatrixWorkspace &ws2) {
-  validateInputs(ws1, ws2, true);
-}
-
 /**
  * Determine the minimum and maximum spectra ids.
  *