Re #11035. Fixed includes in Algorithms.

Framework/API/test/IncreasingAxisValidatorTest.h

@@ -3,7 +3,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/IncreasingAxisValidator.h"
 #include "MantidTestHelpers/FakeObjects.h"
 #include "MantidAPI/NumericAxis.h"
 

Framework/Algorithms/src/AbsorptionCorrection.cpp

@@ -2,13 +2,15 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/AbsorptionCorrection.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/InstrumentValidator.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidGeometry/Objects/ShapeFactory.h"
-#include "MantidKernel/UnitFactory.h"
-#include "MantidKernel/Fast_Exponential.h"
-#include "MantidKernel/VectorHelper.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/CompositeValidator.h"
+#include "MantidKernel/Fast_Exponential.h"
 #include "MantidKernel/ListValidator.h"
+#include "MantidKernel/UnitFactory.h"
+#include "MantidKernel/VectorHelper.h"
 
 namespace Mantid {
 namespace Algorithms {

Framework/Algorithms/src/AlignDetectors.cpp

@@ -4,11 +4,13 @@
 #include "MantidAlgorithms/AlignDetectors.h"
 #include "MantidAPI/FileProperty.h"
 #include "MantidAPI/ITableWorkspace.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/RawCountValidator.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/OffsetsWorkspace.h"
-#include "MantidKernel/V3D.h"
+#include "MantidKernel/CompositeValidator.h"
 #include "MantidKernel/PhysicalConstants.h"
+#include "MantidKernel/V3D.h"
 #include "MantidKernel/UnitFactory.h"
 #include <fstream>
 #include <sstream>

Framework/Algorithms/src/AnnularRingAbsorption.cpp

 #include "MantidAlgorithms/AnnularRingAbsorption.h"
 
 #include "MantidAPI/SampleEnvironment.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/InstrumentValidator.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
 
 #include "MantidGeometry/Instrument/ObjComponent.h"
 #include "MantidGeometry/Instrument/ReferenceFrame.h"
@@ -9,10 +10,11 @@
 #include "MantidGeometry/Objects/ShapeFactory.h"
 
 #include "MantidKernel/Atom.h"
-#include "MantidKernel/NeutronAtom.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/CompositeValidator.h"
 #include "MantidKernel/Material.h"
 #include "MantidKernel/MandatoryValidator.h"
+#include "MantidKernel/NeutronAtom.h"
 #include "MantidKernel/V3D.h"
 
 #include <boost/format.hpp>

Framework/Algorithms/src/AppendSpectra.cpp

 #include "MantidAlgorithms/AppendSpectra.h"
-#include "MantidKernel/System.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/CommonBinsValidator.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/BoundedValidator.h"

Framework/Algorithms/src/ApplyDeadTimeCorr.cpp

@@ -6,7 +6,6 @@
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "boost/lexical_cast.hpp"
-#include "MantidAPI/WorkspaceValidators.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/TableRow.h"
 

Framework/Algorithms/src/ApplyDetailedBalance.cpp

 #include "MantidAlgorithms/ApplyDetailedBalance.h"
-#include "MantidKernel/System.h"
-#include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
+#include "MantidKernel/CompositeValidator.h"
+#include "MantidKernel/PhysicalConstants.h"
 #include "MantidKernel/PropertyWithValue.h"
+#include "MantidKernel/TimeSeriesProperty.h"
+
 #include "boost/lexical_cast.hpp"
 #include <iostream>
 #include <cmath>
-#include "MantidAPI/WorkspaceValidators.h"
-#include "MantidKernel/PhysicalConstants.h"
 
 using std::string;
 using namespace Mantid::Kernel;

Framework/Algorithms/src/ApplyTransmissionCorrection.cpp

@@ -2,9 +2,11 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/ApplyTransmissionCorrection.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/HistogramValidator.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/CompositeValidator.h"
 
 namespace Mantid {
 namespace Algorithms {

Framework/Algorithms/src/BinaryOperateMasks.cpp

 #include "MantidAlgorithms/BinaryOperateMasks.h"
-#include "MantidKernel/System.h"
 #include "MantidDataObjects/MaskWorkspace.h"
-#include "MantidAPI/WorkspaceValidators.h"
 #include "MantidKernel/ListValidator.h"
 
 using namespace Mantid::Kernel;

Framework/Algorithms/src/CalculateEfficiency.cpp

@@ -2,11 +2,10 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/CalculateEfficiency.h"
-#include "MantidAPI/WorkspaceValidators.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidDataObjects/EventList.h"
-#include <vector>
 #include "MantidKernel/BoundedValidator.h"
+#include <vector>
 
 namespace Mantid {
 namespace Algorithms {

Framework/Algorithms/src/CalculateFlatBackground.cpp

@@ -2,17 +2,18 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/CalculateFlatBackground.h"
-#include "MantidAPI/WorkspaceValidators.h"
-#include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidAPI/FunctionFactory.h"
+#include "MantidAPI/HistogramValidator.h"
 #include "MantidAPI/IFunction.h"
+#include "MantidAPI/WorkspaceOpOverloads.h"
+#include "MantidDataObjects/TableWorkspace.h"
 #include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/ListValidator.h"
+#include "MantidKernel/MandatoryValidator.h"
 #include "MantidKernel/VectorHelper.h"
-#include "MantidDataObjects/TableWorkspace.h"
 #include <algorithm>
 #include <climits>
-#include "MantidKernel/ListValidator.h"
-#include "MantidKernel/MandatoryValidator.h"
+#include <numeric>
 #include <boost/lexical_cast.hpp>
 
 namespace Mantid {

Framework/Algorithms/src/CalculateResolution.cpp

 #include "MantidAlgorithms/CalculateResolution.h"
+#include "MantidAPI/InstrumentValidator.h"
 #include "MantidAPI/MatrixWorkspace.h"
-#include "MantidAPI/WorkspaceValidators.h"
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidKernel/TimeSeriesProperty.h"

Framework/Algorithms/src/CalculateTransmission.cpp

@@ -3,14 +3,17 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/CalculateTransmission.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/CommonBinsValidator.h"
+#include "MantidAPI/FunctionFactory.h"
+#include "MantidAPI/HistogramValidator.h"
+#include "MantidAPI/IFunction.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidKernel/ArrayProperty.h"
-#include "MantidKernel/VectorHelper.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/CompositeValidator.h"
 #include "MantidKernel/ListValidator.h"
-#include "MantidAPI/FunctionFactory.h"
-#include "MantidAPI/IFunction.h"
+#include "MantidKernel/VectorHelper.h"
 
 #include <algorithm>
 #include <cassert>

Framework/Algorithms/src/CalculateTransmissionBeamSpreader.cpp

@@ -2,10 +2,12 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/CalculateTransmissionBeamSpreader.h"
-#include "MantidAlgorithms/SumSpectra.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/CommonBinsValidator.h"
+#include "MantidAPI/HistogramValidator.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidAPI/WorkspaceOpOverloads.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/CompositeValidator.h"
 #include "MantidKernel/ListValidator.h"
 
 namespace Mantid {

Framework/Algorithms/src/ChopData.cpp

 #include "MantidAlgorithms/ChopData.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/HistogramValidator.h"
+#include "MantidAPI/SpectraAxisValidator.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
+#include "MantidKernel/CompositeValidator.h"
 #include "MantidKernel/MultiThreaded.h"
 
 namespace Mantid {

Framework/Algorithms/src/ClearInstrumentParameters.cpp

 #include "MantidAlgorithms/ClearInstrumentParameters.h"
 #include "MantidAPI/FileProperty.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/InstrumentValidator.h"
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Instrument.h"
 #include "MantidGeometry/Instrument/ParameterMap.h"

Framework/Algorithms/src/ConjoinWorkspaces.cpp

@@ -2,7 +2,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/ConjoinWorkspaces.h"
-#include "MantidAPI/WorkspaceValidators.h"
+#include "MantidAPI/CommonBinsValidator.h"
 #include "MantidAPI/SpectraAxis.h"
 
 namespace Mantid {

Framework/Algorithms/src/ConvertAxesToRealSpace.cpp

 #include "MantidAlgorithms/ConvertAxesToRealSpace.h"
-#include "MantidAPI/WorkspaceValidators.h"
 #include "MantidAPI/NumericAxis.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/ListValidator.h"

Framework/Algorithms/src/ConvertAxisByFormula.cpp

 #include "MantidAlgorithms/ConvertAxisByFormula.h"
-#include "MantidAPI/WorkspaceValidators.h"
-#include "MantidKernel/ListValidator.h"
-#include "MantidGeometry/muParser_Silent.h"
+#include "MantidAPI/CommonBinsValidator.h"
+#include "MantidAPI/IncreasingAxisValidator.h"
 #include "MantidAPI/RefAxis.h"
+#include "MantidGeometry/muParser_Silent.h"
+#include "MantidKernel/ListValidator.h"
 #include "MantidKernel/UnitFactory.h"
 
 #include <boost/shared_ptr.hpp>

Framework/Algorithms/src/ConvertEmptyToTof.cpp

@@ -3,13 +3,13 @@
 //----------------------------------------------------------------------
 #include "MantidAlgorithms/ConvertEmptyToTof.h"
 
-#include "MantidAPI/WorkspaceValidators.h"
-#include "MantidKernel/ArrayProperty.h"
+#include "MantidAPI/ConstraintFactory.h"
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/IPeakFunction.h"
-#include "MantidAPI/ConstraintFactory.h"
-#include "MantidKernel/UnitFactory.h"
+#include "MantidAPI/WorkspaceUnitValidator.h"
+#include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/BoundedValidator.h"
+#include "MantidKernel/UnitFactory.h"
 
 #include <cmath>
 #include <map>
@@ -54,8 +54,7 @@ const std::string ConvertEmptyToTof::category() const {
  */
 void ConvertEmptyToTof::init() {
 
-  auto wsValidator = boost::make_shared<CompositeValidator>();
-  wsValidator->add<WorkspaceUnitValidator>("Empty");
+  auto wsValidator = boost::make_shared<WorkspaceUnitValidator>("Empty");
   declareProperty(new WorkspaceProperty<DataObjects::Workspace2D>(
                       "InputWorkspace", "", Direction::Input, wsValidator),
                   "Name of the input workspace");