Re #15319. WIP removing Run.h and Sample.h includes (Algos done).

Framework/API/inc/MantidAPI/ExperimentInfo.h

@@ -2,8 +2,6 @@
 #define MANTID_API_EXPERIMENTINFO_H_
 
 #include "MantidAPI/DllConfig.h"
-#include "MantidAPI/Run.h"
-#include "MantidAPI/Sample.h"
 
 #include "MantidAPI/SpectraDetectorTypes.h"
 #include "MantidGeometry/IDetector.h"
@@ -18,6 +16,9 @@ namespace Mantid {
 //---------------------------------------------------------------------------
 // Forward declaration
 //---------------------------------------------------------------------------
+namespace Kernel {
+class Property;
+}
 namespace Geometry {
 class ParameterMap;
 class XMLInstrumentParameter;
@@ -29,6 +30,8 @@ namespace API {
 //---------------------------------------------------------------------------
 class ChopperModel;
 class ModeratorModel;
+class Run;
+class Sample;
 
 /** This class is shared by a few Workspace types
  * and holds information related to a particular experiment/run:

Framework/API/inc/MantidAPI/IMDWorkspace.h

 #ifndef MANTID_API_IMDWORKSPACE_H_
 #define MANTID_API_IMDWORKSPACE_H_
 
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidAPI/MDGeometry.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidGeometry/MDGeometry/IMDDimension.h"
-#include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
-#include "MantidKernel/SpecialCoordinateSystem.h"
-#include <cstdarg>
 #include <cstdint>
 #include <vector>
 
 namespace Mantid {
 
+namespace Geometry {
+class MDImplicitFunction;
+}
+
 namespace API {
 
 class IMDIterator;

Framework/API/src/ExperimentInfo.cpp

@@ -3,6 +3,8 @@
 #include "MantidAPI/ChopperModel.h"
 #include "MantidAPI/InstrumentDataService.h"
 #include "MantidAPI/ModeratorModel.h"
+#include "MantidAPI/Run.h"
+#include "MantidAPI/Sample.h"
 
 #include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
 #include "MantidGeometry/Crystal/OrientedLattice.h"

Framework/API/src/FileBackedExperimentInfo.cpp

-//----------------------------------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------------------------------
+#include "MantidKernel/Logger.h"
 #include "MantidAPI/FileBackedExperimentInfo.h"
 
 #include <sstream>

Framework/API/src/IEventWorkspace.cpp

-//------------------------------------------------------
-// Includes
-//------------------------------------------------------
 #include "MantidAPI/IEventWorkspace.h"
+#include "MantidKernel/IPropertyManager.h"
 
 namespace Mantid {
 

Framework/API/src/IFunction.cpp

-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/IFunction.h"
 #include "MantidAPI/Jacobian.h"
@@ -23,6 +20,7 @@
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/MultiThreaded.h"
 #include "MantidKernel/ProgressBase.h"
+#include "MantidKernel/IPropertyManager.h"
 
 #include <boost/lexical_cast.hpp>
 

Framework/API/src/MatrixWorkspace.cpp

@@ -2,6 +2,7 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/MatrixWorkspaceMDIterator.h"
 #include "MantidAPI/NumericAxis.h"
+#include "MantidAPI/Run.h"
 #include "MantidAPI/SpectraAxis.h"
 #include "MantidAPI/SpectrumDetectorMapping.h"
 #include "MantidAPI/SpectrumInfo.h"

Framework/API/src/MultiPeriodGroupWorker.cpp

@@ -4,6 +4,7 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/Run.h"
 
 using namespace Mantid::Kernel;
 

Framework/API/src/MultipleExperimentInfos.cpp

@@ -2,6 +2,8 @@
 #include "MantidAPI/MultipleExperimentInfos.h"
 #include "MantidKernel/System.h"
 
+#include <boost/make_shared.hpp>
+
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
 

Framework/API/src/SampleShapeValidator.cpp

-//-----------------------------------------------------------------------------
-// Includes
-//-----------------------------------------------------------------------------
 #include "MantidAPI/SampleShapeValidator.h"
+#include "MantidAPI/Sample.h"
 #include "MantidGeometry/Objects/Object.h"
 
 namespace Mantid {
 namespace API {
-//-----------------------------------------------------------------------------
-// Public methods
-//-----------------------------------------------------------------------------
 
 /// @return A string identifier for the type of validator
 std::string SampleShapeValidator::getType() const { return "SampleShape"; }
@@ -18,10 +13,6 @@ Kernel::IValidator_sptr SampleShapeValidator::clone() const {
   return boost::make_shared<SampleShapeValidator>();
 }
 
-//-----------------------------------------------------------------------------
-// Private methods
-//-----------------------------------------------------------------------------
-
 /**
  * Checks that the workspace has a valid sample shape defined
  *  @param value :: The workspace to test

Framework/API/src/SampleValidator.cpp

 #include "MantidAPI/SampleValidator.h"
+#include "MantidAPI/Sample.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidKernel/Material.h"
 #include "MantidKernel/Strings.h"

Framework/API/src/WorkspaceGroup.cpp

-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/Run.h"
 #include "MantidKernel/Logger.h"
 #include "MantidKernel/IPropertyManager.h"
 

Framework/Algorithms/src/AbsorptionCorrection.cpp

-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAlgorithms/AbsorptionCorrection.h"
 #include "MantidAPI/InstrumentValidator.h"
+#include "MantidAPI/Sample.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidGeometry/IDetector.h"

Framework/Algorithms/src/AddPeak.cpp

@@ -3,6 +3,7 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/IPeaksWorkspace.h"
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/Run.h"
 #include "MantidGeometry/Crystal/IPeak.h"
 #include "MantidKernel/Unit.h"
 #include "MantidKernel/System.h"
@@ -18,7 +19,6 @@ DECLARE_ALGORITHM(AddPeak)
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
 
-//----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
  */
 void AddPeak::init() {
@@ -34,7 +34,6 @@ void AddPeak::init() {
   declareProperty("BinCount", 0.0, "Bin count.");
 }
 
-//----------------------------------------------------------------------------------------------
 /** Execute the algorithm.
  */
 void AddPeak::exec() {

Framework/Algorithms/src/AnyShapeAbsorption.cpp

-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAlgorithms/AnyShapeAbsorption.h"
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/Run.h"
 #include "MantidGeometry/Objects/ShapeFactory.h"
 #include "MantidKernel/BoundedValidator.h"
 

Framework/Algorithms/src/AppendSpectra.cpp

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

Framework/Algorithms/src/ApplyDeadTimeCorr.cpp

-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAlgorithms/ApplyDeadTimeCorr.h"
 #include "MantidAPI/EqualBinSizesValidator.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/Run.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/System.h"
@@ -24,7 +22,6 @@ namespace Algorithms {
 // Register the algorithm into the AlgorithmFactory
 DECLARE_ALGORITHM(ApplyDeadTimeCorr)
 
-//----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
    */
 void ApplyDeadTimeCorr::init() {
@@ -44,7 +41,6 @@ void ApplyDeadTimeCorr::init() {
       "The name of the output workspace containing corrected counts");
 }
 
-//----------------------------------------------------------------------------------------------
 /** Execute the algorithm.
    */
 void ApplyDeadTimeCorr::exec() {

Framework/Algorithms/src/ApplyDetailedBalance.cpp

 #include "MantidAlgorithms/ApplyDetailedBalance.h"
+#include "MantidAPI/Run.h"
 #include "MantidAPI/WorkspaceUnitValidator.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/CompositeValidator.h"
@@ -19,7 +20,6 @@ namespace Algorithms {
 // Register the algorithm into the AlgorithmFactory
 DECLARE_ALGORITHM(ApplyDetailedBalance)
 
-//----------------------------------------------------------------------------------------------
 /** Initialize the algorithm's properties.
  */
 void ApplyDetailedBalance::init() {
@@ -37,7 +37,6 @@ void ApplyDetailedBalance::init() {
       "SampleLog variable name that contains the temperature, or a number");
 }
 
-//----------------------------------------------------------------------------------------------
 /** Execute the algorithm.
  */
 void ApplyDetailedBalance::exec() {

Framework/Algorithms/src/AverageLogData.cpp

 #include "MantidAlgorithms/AverageLogData.h"
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/Run.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 
 using namespace Mantid::Kernel;

Framework/Algorithms/src/CalMuonDeadTime.cpp

-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
 #include "MantidAlgorithms/CalMuonDeadTime.h"
 #include "MantidAPI/IFunction.h"
 #include "MantidAPI/ITableWorkspace.h"
 #include "MantidAPI/MatrixWorkspace.h"
+#include "MantidAPI/Run.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/ArrayProperty.h"
+#include "MantidKernel/PhysicalConstants.h"
 
 #include <cmath>
 #include <vector>