diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp
index c2be61dd68e6ce81811f52c73f9aaea1fa4ca091..869d392eb5d3b2815bec643b6db8587f7bb94cc0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Clipboard::Clipboard() : m_subtrees(boost::none), m_subtreeRoots(boost::none) {}
@@ -156,5 +157,6 @@ Clipboard::mutableSubtreeRoots() {
bool containsGroups(Clipboard const &clipboard) {
return containsGroups(clipboard.subtreeRoots());
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h
index 03bd87ecaef9164ae1b0ae5eff9ad8a463320ebd..46ffb6e7bc8de20dd71ce88247473b282fa82350 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Clipboard.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Clipboard {
public:
@@ -67,6 +68,7 @@ private:
};
bool containsGroups(Clipboard const &clipboard);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_CLIPBOARD_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/First.h b/qt/scientific_interfaces/ISISReflectometry/Common/First.h
index 2d22da4828e5f48359b229337695b595bb105b12..5de221013ac0b19e279104ef2794b3b854a6612a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/First.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/First.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T> boost::optional<T> first(std::vector<T> const &values) {
if (values.size() > 0)
@@ -39,6 +40,7 @@ public:
return boost::none;
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_FIRST_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp
index 0e0f99ba309504abeaac29429b129bd9318e7fa9..ec5a1dc1c93ea21cb53884512cb8981f0c0ba889 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.cpp
@@ -7,6 +7,7 @@
#include "GetInstrumentParameter.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
std::vector<std::string> InstrumentParameter<std::string>::get(
Mantid::Geometry::Instrument_const_sptr instrument,
@@ -69,5 +70,6 @@ std::string const &InstrumentParameterTypeMissmatch::expectedType() const {
std::string const &InstrumentParameterTypeMissmatch::originalMessage() const {
return m_originalMessage;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h
index 8a5de6c134b38498ac3e2cf5dd09a2907517f073..ee576030250db3d57e5780728fdafbb3571b4bdc 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/GetInstrumentParameter.h
@@ -12,6 +12,7 @@
#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T> class InstrumentParameter;
template <> class InstrumentParameter<std::string> {
@@ -131,6 +132,7 @@ auto getInstrumentParameter(Mantid::Geometry::Instrument_const_sptr instrument,
std::declval<std::string const &>())) {
return InstrumentParameter<T>::get(instrument, parameterName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_GETINSTRUMENTPARAMETER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h b/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h
index 126aa99283d09806cf33a7c2aadaf3f74af9f65d..d222f9c26101155858d801082759939eba5f1a9b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/IndexOf.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Container, typename Predicate>
boost::optional<int> indexOf(Container const &container, Predicate pred) {
@@ -30,6 +31,7 @@ boost::optional<int> indexOfValue(Container const &container, ValueType value) {
else
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INDEXOF_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp
index 3267fc7dd2eab183aa11c10ecd883717f67df4a4..43f3e9ae6222bed6ebc3d3ccd3dac6a671d39e0f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.cpp
@@ -7,6 +7,7 @@
#include "InstrumentParameters.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
InstrumentParameters::InstrumentParameters(
Mantid::Geometry::Instrument_const_sptr instrument)
: m_instrument(std::move(instrument)) {}
@@ -32,5 +33,6 @@ bool InstrumentParameters::hasMissingValues() const {
std::string const &MissingInstrumentParameterValue::parameterName() const {
return m_parameterName;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h
index 7c0f9700dc540968af2b0411ad648487ac6e2fa0..dd883d98edd870e82c0222e0777819e1605588d8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/InstrumentParameters.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T>
boost::optional<T>
@@ -133,6 +134,7 @@ private:
std::vector<InstrumentParameterTypeMissmatch> m_typeErrors;
std::vector<MissingInstrumentParameterValue> m_missingValueErrors;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPARAMETERS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Map.h b/qt/scientific_interfaces/ISISReflectometry/Common/Map.h
index a46ecc00a4c977ea198a232ac635f79c9d4bf565..1fe767386ecb1b30e2a7a7b022e4ceac6b8448ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Map.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Map.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Container, typename Transform,
typename Out = typename std::result_of<
@@ -42,6 +43,7 @@ std::string optionalToString(boost::optional<T> maybeValue) {
})
.get_value_or(std::string());
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_MAP_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp
index 8828d84f582578a3b35a9d609d22d449f517c721..684edeb5826f1da30cd62d7dd781aeac5d25c7c3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
OptionDefaults::OptionDefaults(
Mantid::Geometry::Instrument_const_sptr instrument)
@@ -57,5 +58,6 @@ std::string OptionDefaults::getString(std::string const &propertyName,
std::string const ¶meterName) const {
return getValue<std::string>(propertyName, parameterName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h
index 9fe038f48b5b89865f3ef9a4b8c4314fc1bf6103..9c56920ee666ca96cb6041da0f158a8da419bb84 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/OptionDefaults.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class OptionDefaults
@@ -78,6 +79,7 @@ T OptionDefaults::getValue(std::string const &propertyName,
return Mantid::API::checkForMandatoryInstrumentDefault<T>(
m_algorithm.get(), propertyName, m_instrument, parameterName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_OPTIONDEFAULTS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp
index aed41e164b8a331ea45c28927236918c5d3c24bd..bc848c05e930f31f15df261eb46a44bcfcfd8cd7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
bool isEntirelyWhitespace(std::string const &string) {
return std::all_of(string.cbegin(), string.cend(),
@@ -70,5 +71,6 @@ boost::optional<int> parseNonNegativeInt(std::string string) {
else
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h
index 9b8af9f80c526751d087471467d579248512b3fe..83ec23b82a010a8469cd88a6336b499e90042bae 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/Parse.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
MANTIDQT_ISISREFLECTOMETRY_DLL boost::optional<double>
parseDouble(std::string string);
@@ -56,6 +57,7 @@ parseList(std::string commaSeparatedValues, ParseItemFunction parseItem) {
return std::vector<ParsedItem>();
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PARSE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h b/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h
index 0bd033cb89dc92b1d35ece2c677976c45b692c59..be15f6996b447ef66107ced01b3a762d75305769 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/QWidgetGroup.h
@@ -11,6 +11,7 @@
#include <cstddef>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <std::size_t N> class QWidgetGroup {
public:
QWidgetGroup() : m_widgets() {}
@@ -36,6 +37,7 @@ QWidgetGroup<sizeof...(Ts)> makeQWidgetGroup(Ts... widgets) {
return QWidgetGroup<sizeof...(Ts)>(
std::array<QWidget *, sizeof...(Ts)>({{widgets...}}));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_QWIDGETGROUP_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h b/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h
index 48f900717aae5e92cde80e6a3a1881e6f8c692a1..f76c51cf4ee64ba409e012ec9554f24da0f9b53b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/ValidationResult.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Validated, typename Error = boost::blank>
class ValidationResult {
@@ -69,6 +70,7 @@ ValidationResult<Validated, Error>::validElseNone() const {
else
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_RESULT_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h b/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h
index 5fc1224e9f35b8f2936eb8f27b00fa1a7c13258b..6b22749cc6a61e7598a7880db8c5e4a3827b439c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Common/ZipRange.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <class... Containers>
auto zip_range(Containers &... containers)
@@ -20,6 +21,7 @@ auto zip_range(Containers &... containers)
return {boost::make_zip_iterator(boost::make_tuple(containers.begin()...)),
boost::make_zip_iterator(boost::make_tuple(containers.end()...))};
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_ZIPRANGE_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp
index 0c571a71d4f350b6b2b2b926d650ec588a89702a..67228f863ee596fcf34535723c9ec6d3a9b1110a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.cpp
@@ -11,12 +11,13 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
+namespace AlgorithmProperties {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
using Mantid::API::Workspace_sptr;
-namespace AlgorithmProperties {
std::string boolToString(bool value) { return value ? "1" : "0"; }
void update(std::string const &property, std::string const &value,
@@ -77,5 +78,6 @@ std::string getOutputWorkspace(IAlgorithm_sptr algorithm,
return workspaceName;
}
} // namespace AlgorithmProperties
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h
index 94da50106c540c0625dc37f58c18d89ff201a685..fdc4920a4971496ca00a317760957c6c34f0cef2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/AlgorithmProperties.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace AlgorithmProperties {
using AlgorithmRuntimeProps = std::map<std::string, std::string>;
@@ -61,6 +62,7 @@ void update(std::string const &property, std::vector<VALUE_TYPE> const &values,
update(property, value, properties);
}
} // namespace AlgorithmProperties
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp
index bdb8642839f78a7aa29b28f8df7a3cb2c76bdc61..8cc23e5c2f8d502ca231ac1830c0cf4c1d84f1fb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
@@ -26,5 +27,6 @@ void BatchJobAlgorithm::updateItem() {
if (m_item)
m_updateFunction(m_algorithm, *m_item);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h
index 57821d98b8ac24e59aabcd05a3f5edcbc65b4a34..837951ad9779890e63a6e6dd62f4311c489bdb0c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobAlgorithm.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/**
* The BatchJobAlgorithm class overrides ConfiguredAlgorithm so that
@@ -41,6 +42,7 @@ private:
};
using BatchJobAlgorithm_sptr = boost::shared_ptr<BatchJobAlgorithm>;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp
index 842dd087d5f2b7935f164a794a9405fd96974235..c7c2175a001f78d7716b05ea289d8414c5b20d43 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
@@ -294,5 +295,6 @@ void BatchJobRunner::notifyAllWorkspacesDeleted() {
// All output workspaces will be deleted so reset all rows and groups
m_batch.resetState();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h
index a7a0de0a6d99aaadb6f481fb046eb95efd5fd4f2..de7eb176d4f20a1671e04eabf7f89484fb247f91 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchJobRunner.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/**
* The BatchJobRunner class sets up algorithms to run based on the reduction
@@ -80,6 +81,7 @@ private:
Row &row,
std::deque<MantidQt::API::IConfiguredAlgorithm_sptr> &algorithms);
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp
index 73d946eceb352fb7e73f2bcbda64f4fe37554354..13e263dbececbb09d64a12548023751a9b01a186 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.cpp
@@ -21,6 +21,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::AlgorithmManager;
@@ -353,5 +354,6 @@ void BatchPresenter::clearADSHandle() {
m_runsPresenter->notifyRowOutputsChanged();
m_runsPresenter->notifyRowStateChanged();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h
index b890fdf0b029a1da34c701eef3394b656d7ee4d8..10d410309e51c0ae5078cb78cbf633a089411c6d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenter.h
@@ -22,6 +22,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchView;
@@ -108,6 +109,7 @@ private:
protected:
std::unique_ptr<IBatchJobRunner> m_jobRunner;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_BATCHPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h
index 4837f36f6f119ec0c70bfc71f7d9a32df0354342..a65085140a60d5d704087067643d520707033c73 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/BatchPresenterFactory.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class BatchPresenterFactory {
public:
BatchPresenterFactory(
@@ -60,6 +61,7 @@ private:
InstrumentPresenterFactory m_instrumentPresenterFactory;
SavePresenterFactory m_savePresenterFactory;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_BATCHPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp
index 9a7990ef9ec5eef54c8f1b59369bbbc21086f747..9ea502693696668e66f350a79b337059d3a471ce 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.cpp
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
@@ -144,5 +145,6 @@ AlgorithmRuntimeProps createAlgorithmRuntimeProps(Batch const &model,
updateStitchProperties(properties, model.experiment().stitchParameters());
return properties;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h
index 395db59ab0f428dd87d07733663bf1f87fbbdef5..45880fd9627cbfbb4d2149ecb7b3536f47dde69f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/GroupProcessingAlgorithm.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Batch;
class Group;
class IConfiguredAlgorithm;
@@ -26,6 +27,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL MantidQt::API::IConfiguredAlgorithm_sptr
createConfiguredAlgorithm(Batch const &model, Group &group);
MANTIDQT_ISISREFLECTOMETRY_DLL AlgorithmRuntimeProps
createAlgorithmRuntimeProps(Batch const &model, Group const &group);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h
index ad96dfd80a6158c51118860ff6f0efe09c81120a..a536b933eb7675a5effb9f1aaa373e182112c72f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobAlgorithm.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Item;
@@ -26,6 +27,7 @@ public:
virtual void updateItem() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h
index 618e196932be2b2dc3812e1d4ab0cb566d7a154b..3b77b3d1de73ee14705d825b496bf8553768e4d8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchJobRunner.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IBatchJobRunner {
public:
@@ -46,6 +47,7 @@ public:
getAlgorithms() = 0;
virtual AlgorithmRuntimeProps rowProcessingProperties() const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h
index 67c40314d4efed6ea9ea347b5f8c9ea4a526cc46..439668b7b4fe7105236f7333ed6f782ccf194cd1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchPresenter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IMainWindowPresenter;
@@ -53,6 +54,7 @@ public:
virtual Mantid::Geometry::Instrument_const_sptr instrument() const = 0;
virtual std::string instrumentName() const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IBATCHPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h
index 5eb64a069b1a07031d4eb8839be100bb07fa251f..4b1944f5f0e4783d615707db2e2b9ee45eaea9e5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/IBatchView.h
@@ -23,6 +23,7 @@ using IConfiguredAlgorithm_sptr = boost::shared_ptr<IConfiguredAlgorithm>;
} // namespace API
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL BatchViewSubscriber {
public:
@@ -57,6 +58,7 @@ public:
virtual void executeAlgorithmQueue() = 0;
virtual void cancelAlgorithmQueue() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IBATCHVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp
index 9a48ee56e3c19bf44a873c8cd6c81644db6422db..4a4cab04611afe88cacc97ec53738dd0b89dae4c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.cpp
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::BatchAlgorithmRunner;
using Mantid::API::IAlgorithm_sptr;
@@ -135,5 +136,6 @@ IAlgorithm_sptr QtBatchView::createReductionAlg() {
std::unique_ptr<QtSaveView> QtBatchView::createSaveTab() {
return std::make_unique<QtSaveView>(this);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h
index bc5f29b3ff4e08040ed7443e9a87c00759eb8922..86d2c720cc9ea998b9594483efb478434f3c48a3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/QtBatchView.h
@@ -22,6 +22,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class QtBatchView : public QWidget, public IBatchView {
Q_OBJECT
@@ -66,6 +67,7 @@ private:
std::unique_ptr<QtInstrumentView> m_instrument;
API::BatchAlgorithmRunner m_batchAlgoRunner;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTBATCHVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp
index 6835be161bd6786abb6e97207d898f8b3a5ab81e..320fa6b7d86d0339dc7bd22f2bd626384c38e85c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.cpp
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using API::IConfiguredAlgorithm_sptr;
using Mantid::API::IAlgorithm_sptr;
@@ -311,5 +312,6 @@ AlgorithmRuntimeProps createAlgorithmRuntimeProps(Batch const &model) {
updatePerThetaDefaultProperties(properties, model.wildcardDefaults());
return properties;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h
index 648f5e90f69904e60d1c9e8c9fd84eafc163e4c4..80d17d47bceca252fcceb93d5e243942a938ea76 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Batch/RowProcessingAlgorithm.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Batch;
class Row;
class IConfiguredAlgorithm;
@@ -29,6 +30,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL AlgorithmRuntimeProps
createAlgorithmRuntimeProps(Batch const &model, Row const &row);
MANTIDQT_ISISREFLECTOMETRY_DLL AlgorithmRuntimeProps
createAlgorithmRuntimeProps(Batch const &model);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h
index b7f111fd15bfd6beaa04d1220158bb9c11d50fff..16bb9666da57b8ae15ad03acc06fd14925ff50f8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IMessageHandler.h
@@ -10,6 +10,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IMessageHandler
IMessageHandler is an interface for passing messages to the user
@@ -24,6 +25,7 @@ public:
virtual bool askUserYesNo(const std::string &prompt,
const std::string &title) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h
index 0212bd006f59e2be140f9fc19967efdf465980eb..3c3ec2160395f7cd7b3644dc00d5e3664ab894c5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPlotter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IPlotter {
public:
@@ -21,7 +22,8 @@ public:
reflectometryPlot(const std::vector<std::string> &workspaces) const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
-#endif /* MANTID_ISISREFLECTOMETRY_IPLOTTER_H */
\ No newline at end of file
+#endif /* MANTID_ISISREFLECTOMETRY_IPLOTTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h
index 191fe2f6b063747c49cc0a66aa537fc2b7deaab1..0d744909ae941056b9888a1a1b49288d4d543e18 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/IPythonRunner.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IPythonRunner
IPythonRunner is an interface for running python code
@@ -23,6 +24,7 @@ public:
virtual ~IPythonRunner(){};
virtual std::string runPythonAlgorithm(const std::string &pythonCode) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp
index 2de84b6d25719fe1f536c05d849b4df46b63d30f..e4c9a1ff3a18026a907525c57ceab8ec36f9a4b0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.cpp
@@ -23,6 +23,7 @@ using namespace MantidQt::Widgets::MplCpp;
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Plotter::Plotter(MantidQt::CustomInterfaces::IPythonRunner *pythonRunner)
@@ -90,5 +91,6 @@ void Plotter::runPython(const std::string &pythonCode) const {
}
#endif
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h
index 06f7be748833e82960c46677aec005d9bf74d91f..16589be79880ddc421e2befcc87b903d85413697 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Common/Plotter.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
class IPythonRunner;
#endif
@@ -36,6 +37,7 @@ private:
#endif
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
index 3cbcbdccdfc189f785e095311498353e7a8d2cee..6b54a265809f4d12a5967f6550def65bd91dd8a9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param view :: The view we are handling
@@ -148,5 +149,6 @@ bool EventPresenter::isProcessing() const {
bool EventPresenter::isAutoreducing() const {
return m_mainPresenter->isAutoreducing();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
index 7952fe1ec5c6bcd02af40b99cb60c55f7fd8245b..daece40d0f69eeb5a80885b4d6381c0c60bf79ef 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class EventPresenter
@@ -58,6 +59,7 @@ private:
IEventView *m_view;
SliceType m_sliceType;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
index e28d25f588b4a3d909a49c0ed335f605f12ba2c3..4f62cd74935930b59e7d10f367116d1f1dbe4c6c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/EventPresenterFactory.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class EventPresenterFactory {
public:
@@ -21,6 +22,7 @@ public:
return std::make_unique<EventPresenter>(view);
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_REFLEVENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
index 0a9e6e4c4d2b4e455c46542bf742eeb30d556792..722ee6b04602a55b4b4386aabc03a5678568232c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventPresenter.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IEventPresenter
@@ -30,6 +31,7 @@ public:
virtual void autoreductionResumed() = 0;
virtual Slicing const &slicing() const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLEVENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h
index f0a77b99a533b1783ebdf6c7a7f2bfc696203428..49f32340a49c6c6689f61245d8cc3e02ce6574ba 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/IEventView.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class SliceType { None, UniformEven, Uniform, Custom, LogValue };
@@ -54,6 +55,7 @@ public:
virtual void enableSliceTypeSelection() = 0;
virtual void disableSliceTypeSelection() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_IREFLEVENTVIEW_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp
index aa594f76ea760089d476326a5b2f47a8e0181498..d04d6bb986ab629fc7793719c543827da5f3df15 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param parent :: [input] The parent of this widget
@@ -214,5 +215,6 @@ void QtEventView::onToggleDisabledSlicing(bool isChecked) {
m_notifyee->notifySliceTypeChanged(SliceType::None);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h
index fb5485ab6e80d2ea30e340d92d709ed925e47a11..87520ae24ca69eeab4e2242699bde4a093d1c407 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Event/QtEventView.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtEventView : Provides an interface for the "Event Handling" widget
in
@@ -79,6 +80,7 @@ private:
EventViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp
index 9cee8d09354b6f31d96e95ea3ede98c603b26c9d..affbafed7fb63a15d99970aaf00c46540fa8e727 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// unnamed namespace
namespace {
@@ -110,5 +111,6 @@ Experiment ExperimentOptionDefaults::get(
Mantid::Geometry::Instrument_const_sptr instrument) {
return getExperimentDefaults(instrument);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h
index a9086765f5af5b05acf550aeea374b2956b50f13..a161d691008335a4022d3eebb53668e474356dde 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentOptionDefaults.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IExperimentOptionDefaults {
public:
@@ -30,6 +31,7 @@ class MANTIDQT_ISISREFLECTOMETRY_DLL ExperimentOptionDefaults
public:
Experiment get(Mantid::Geometry::Instrument_const_sptr instrument) override;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTOPTIONDEFAULTS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
index a93ee13aa6765c748cd75b9053ee138addf8591f..e1631fa98643535ed506e2489230cbbd6c041028 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// unnamed namespace
namespace {
Mantid::Kernel::Logger g_log("Reflectometry GUI");
@@ -329,5 +330,6 @@ void ExperimentPresenter::updateViewFromModel() {
// Reconnect settings change notifications
m_view->connectExperimentSettingsWidgets();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
index ef6eeb1ef5f6677d7a9ce1dbc3dc347d9f237a14..d168015e4ec0cdad3ab99ca8bce46f358039f759 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenter.h
@@ -18,6 +18,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class ExperimentValidationErrors {
public:
@@ -103,6 +104,7 @@ private:
Experiment m_model;
double m_thetaTolerance;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
index 58196b1589fe2d83136cece717ba9ee4473cc124..3200d72346109a250a7e5ca2b76ce017ec5fc0dd 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ExperimentPresenterFactory.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class ExperimentPresenterFactory {
public:
@@ -29,6 +30,7 @@ public:
private:
double m_thetaTolerance;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_EXPERIMENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
index 12042dd89c30fba9061c9d5372637ed127c9b4bc..12fed381e6fca4f593156bfff868323efad03798 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentPresenter.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class Instrument_const_sptr;
class IExperimentPresenter {
@@ -29,6 +30,7 @@ public:
virtual void instrumentChanged(std::string const &instrumentName) = 0;
virtual void restoreDefaults() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IEXPERIMENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
index 7442bd0dabcecf8b043960571c6e325fcace6b35..0fff1054a6151580c05e4911b7754498ecfcd408 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/IExperimentView.h
@@ -18,6 +18,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IExperimentView
@@ -117,6 +118,7 @@ public:
virtual ~IExperimentView() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IEXPERIMENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
index 29abd74202ede91245b9b2e0e1faa1288d28d123..02a933b1edbb5438ecab769104cc6ee43ed73f84 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
InvalidDefaultsError::InvalidDefaultsError( // cppcheck-suppress passedByValue
int row, std::vector<int> invalidColumns)
@@ -28,5 +29,6 @@ bool operator!=(InvalidDefaultsError const &lhs,
InvalidDefaultsError const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
index f3bc871557b7ed4614365b4eee12e351b63e907b..f5d50752a82e3c8c53db9d9a89d933adc2476a43 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/InvalidDefaultsError.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL InvalidDefaultsError {
public:
@@ -27,6 +28,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(InvalidDefaultsError const &lhs,
InvalidDefaultsError const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(InvalidDefaultsError const &lhs,
InvalidDefaultsError const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INVALIDDEFAULTSERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
index 8c3ae78dff4f1d7fb5136ba62b97dd09fd374ce4..8fb79d11ae52a7d135f451c91c284e63f12ea70d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.cpp
@@ -8,6 +8,7 @@
#include "ThetaValuesValidationError.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
PerThetaDefaultsTableValidationError::PerThetaDefaultsTableValidationError(
// cppcheck-suppress passedByValue
@@ -25,5 +26,6 @@ boost::optional<ThetaValuesValidationError>
PerThetaDefaultsTableValidationError::fullTableError() const {
return m_fullTableError;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
index 8aa0e950182b9e9273c9343656d89ecc1223a820..6213599d1ab53b856a36fef220e6c1427727be85 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidationError.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL PerThetaDefaultsTableValidationError {
public:
@@ -28,6 +29,7 @@ private:
boost::optional<ThetaValuesValidationError> m_fullTableError;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATIONERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
index 6db40973b6e30604e21e2ff7b0eb5344449bf02a..c1cd843f0a5c842b250e2485561c28af2a5bc735 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
auto PerThetaDefaultsTableValidator::
operator()(ContentType const &perThetaDefaultsContent,
@@ -124,5 +125,6 @@ void PerThetaDefaultsTableValidator::appendThetaErrorForAllRows(
for (auto row = 0u; row < rowCount; ++row)
validationErrors.emplace_back(row, std::vector<int>({0}));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
index e64999ec0455e6901859c1bc989be09253697b6a..182d517c8d6875724a11dc355b6e81d5e330ced9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/PerThetaDefaultsTableValidator.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL PerThetaDefaultsTableValidator {
public:
@@ -44,6 +45,7 @@ public:
std::vector<InvalidDefaultsError> &validationErrors,
std::size_t rowCount) const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_PERTHETADEFAULTSTABLEVALIDATOR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
index 509f56ce1d9a25331d9678be1e0cd695860453b9..639357a97c76eeeb77a2070c2a4942cb5af221e2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
// Changing the palette for spin boxes doesn't work but we can
@@ -711,5 +712,6 @@ void showOptionLoadErrors(
std::vector<InstrumentParameterTypeMissmatch> const &typeErrors,
std::vector<MissingInstrumentParameterValue> const &missingValues);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
index a7d1afec11ebde4e510df16230480748cdc05382..e287d14d4751620c197d6196c81fa2474c3213dd 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/QtExperimentView.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** ExperiementView : Provides an interface for the "Experiement" tab in the
ISIS Reflectometry interface.
@@ -176,6 +177,7 @@ private:
ExperimentViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
index e7c0e6b798e7055222a57110648d82bb9b6bc69c..62585b3a0ffd0625cefd900a4dff24e0e562d2c3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Experiment/ThetaValuesValidationError.h
@@ -8,8 +8,10 @@
#define MANTID_ISISREFLECTOMETRY_THETAVALUESVALIDATIONERROR_H
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class ThetaValuesValidationError { MultipleWildcards, NonUniqueTheta };
-}
+} // namespace ISISReflectometry
+} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_THETAVALUESVALIDATIONERROR_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
index 05bf4aacde1eb102fb344dca457b9a22a5c38fab..8411d910f3ceb3031dd63913e86f128846da4c28 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentPresenter.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchPresenter;
@@ -34,6 +35,7 @@ public:
virtual void instrumentChanged(std::string const &instrumentName) = 0;
virtual void restoreDefaults() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IINSTRUMENTPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
index bf6b33f9bf69712464a4a4902fa5c16178e0cfd7..a353aca2709e92420dda9ea920eb8846ddf7a3c6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/IInstrumentView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IInstrumentView
@@ -71,6 +72,7 @@ public:
virtual void enableDetectorCorrectionType() = 0;
virtual void disableDetectorCorrectionType() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IINSTRUMENTVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp
index e5db4a8a2d292132ecf40a962b42b400900dd8bf..a1c3b4f1f4c56660b836e590e4ddbab559d67956 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// unnamed namespace
namespace {
@@ -66,5 +67,6 @@ Instrument InstrumentOptionDefaults::get(
Mantid::Geometry::Instrument_const_sptr instrument) {
return getInstrumentDefaults(instrument);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h
index 433262703b220689f46d4f1d684212c33a88bda9..7563380e8705f42a9a1c98dc6efdd98f896eebce 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentOptionDefaults.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL IInstrumentOptionDefaults {
public:
@@ -32,6 +33,7 @@ class MANTIDQT_ISISREFLECTOMETRY_DLL InstrumentOptionDefaults
public:
Instrument get(Mantid::Geometry::Instrument_const_sptr instrument) override;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTOPTIONDEFAULTS_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
index 5ce16626a05e04beba6071a334b9e1319aa1195e..279b851932a98a8e80e2928cf8646d052d3812d6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
Mantid::Kernel::Logger g_log("Reflectometry GUI");
@@ -230,5 +231,6 @@ void InstrumentPresenter::updateViewFromModel() {
// Reconnect settings change notifications
m_view->connectInstrumentSettingsWidgets();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
index d7d53009a3fe2f21bcdf20e1d555d7c88aee8bd2..e9c40ec3d939fe6925430bbd44a6aab6178fed31 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenter.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class InstrumentPresenter
@@ -67,6 +68,7 @@ private:
bool isProcessing() const;
bool isAutoreducing() const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
index b64b49c49a7eeba2776817827e012aa074280f2a..050a2d59288759a1e86cb27b5fa6182d1c444721 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/InstrumentPresenterFactory.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class InstrumentPresenterFactory {
public:
@@ -24,6 +25,7 @@ public:
return std::make_unique<InstrumentPresenter>(view, Instrument());
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_INSTRUMENTPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp
index 5e51074ca9b7d2c3ab457ab2aa77d28cf51c24a8..802d285c09ccfb9ae033cbfc8993f3dd5354e205 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.cpp
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
// Changing the palette for spin boxes doesn't work but we can
@@ -382,5 +383,6 @@ std::string QtInstrumentView::getDetectorCorrectionType() const {
void QtInstrumentView::setDetectorCorrectionType(std::string const &value) {
setSelected(*m_ui.detectorCorrectionTypeComboBox, value);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h
index cf025d596449efbe57555eb25060377ea17809a4..873561e971290fe02e8e0def0ca83d6860a4c8aa 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Instrument/QtInstrumentView.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtInstrumentView : Provides an interface for the "Instrument" tab in the
ISIS Reflectometry interface.
@@ -111,6 +112,7 @@ private:
InstrumentViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h
index 5ae6dc5c0e559acbcc45508e10e1005c29dfa649..0693f339b6fe9dfb8affe73159f67cf6683655f8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowPresenter.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IMainWindowPresenter
@@ -27,6 +28,7 @@ public:
virtual void notifyAutoreductionPaused() = 0;
virtual ~IMainWindowPresenter() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IMAINWINDOWPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h
index 59c16a5fbae80617486c9179bc0e026be2e4a0ae..07c6d5c5cc2895a1bc0491aa3bde32b030dbd6b2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/IMainWindowView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class IMainWindowView
@@ -38,6 +39,7 @@ public:
virtual ~IMainWindowView() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLWINDOWVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
index bc245d7b2622c505449468665f6cd7cdc892784f..d62d6bf46420e1c9e06270c4c0bfc7e5ceece6fa 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param view :: [input] The view we are managing
@@ -99,5 +100,6 @@ void MainWindowPresenter::showHelp() {
MantidQt::API::HelpWindow::showCustomInterface(nullptr,
QString("ISIS Reflectometry"));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
index d4694d338c61a6e7685bdf88f96569bf0a2654ba..29caa2e4a68c1c0965dda1299024972d5cced29d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IMainWindowView;
class IMessageHandler;
@@ -52,6 +53,7 @@ private:
BatchPresenterFactory m_batchPresenterFactory;
std::vector<std::shared_ptr<IBatchPresenter>> m_batchPresenters;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_MAINWINDOWPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp
index 1b455319205b708cadd4e9c47269566b4e3fdaa5..c22b9531d6718e1b23e41e289cc8768586ceaa14 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
@@ -168,5 +169,6 @@ bool QtMainWindowView::askUserYesNo(const std::string &prompt,
return false;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h
index 0402efc590920ca90de494e2d3fb612775ca16f9..0154005818f1660328f573535d34852f4cf9795c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/QtMainWindowView.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class QtMainWindowView
@@ -70,6 +71,7 @@ private:
std::unique_ptr<MainWindowPresenter> m_presenter;
std::vector<IBatchView *> m_batchViews;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTMAINWINDOWVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp
index f97eb03b4ab53eea0e1122b9e128fc96d36e57d5..950e58fbe37dd89afc7e1940f29757eb07c7ebfc 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
CatalogRunNotifier::CatalogRunNotifier(IRunsView *view) : m_view(view) {
m_view->subscribeTimer(this);
@@ -27,5 +28,6 @@ void CatalogRunNotifier::notifyTimerEvent() {
if (m_notifyee)
m_notifyee->notifyCheckForNewRuns();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h
index 6839446a7b673980aa404582947686d3468380e8..bdd27f877076a8200a072e7bb97f7ed5bc435dfc 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/CatalogRunNotifier.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class CatalogRunNotifier
CatalogRunNotifier implements IRunNotifier to provide functionality to
@@ -39,6 +40,7 @@ private:
IRunsView *m_view;
RunNotifierSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h
index 580644a95e67fb8760bb4e8be06b3e9b1ec4ee84..e4f09216204cee49642a7566a85de33f12d44956 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunNotifier.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RunNotifierSubscriber {
public:
@@ -29,6 +30,7 @@ public:
virtual void startPolling() = 0;
virtual void stopPolling() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h
index 224a7e87ddadd54e77df69118db322831f9adfae..ecb3baa61e31f5ce084b42ba63a370d9ac1ffeb0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsPresenter.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchPresenter;
@@ -51,6 +52,7 @@ public:
virtual int percentComplete() const = 0;
virtual void notifySearchComplete() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLRUNSPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h
index 1c1a9a1a52f0430921d4d262f4dbc940940d8bf5..6d915f37f3dd5df5616e771d157e324f8e6c1fe5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/IRunsView.h
@@ -23,6 +23,7 @@ class AlgorithmRunner;
}
namespace CustomInterfaces {
+namespace ISISReflectometry {
/**
IRunsView is the base view class for the Reflectometry "Runs"
@@ -107,6 +108,7 @@ public:
virtual void startMonitor() = 0;
virtual void stopMonitor() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IRUNSVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h
index 0eb68c7d2610dfd0f211ed2dcbe5a8eddab7dd40..fae776dc8a730c2c7a7b6d4e28644c80a7b68a6d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearchModel.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL ISearchModel {
public:
@@ -27,6 +28,7 @@ public:
/// Typedef for a shared pointer to \c SearchModel
using ISearchModel_sptr = boost::shared_ptr<ISearchModel>;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h
index 755cf5425ccd8e610d34ae07a65251b36c1dcb74..e1a7ef9532b6f305bc93ed577043405f45b85cac 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/ISearcher.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class SearcherSubscriber {
public:
@@ -46,6 +47,7 @@ public:
const std::string &instrument,
SearchType searchType) const = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp
index 8b8403dbdda1f68395e66f2a5cc5f520b6648ede..c93460d5ad12d541fb5f98fec921840b374f6506 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.cpp
@@ -18,6 +18,7 @@ using namespace Mantid::API;
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
void removeResultsWithoutFilenameExtension(ITableWorkspace_sptr results) {
@@ -204,5 +205,6 @@ QtCatalogSearcher::createSearchAlgorithm(const std::string &text) {
ISearchModel &QtCatalogSearcher::results() const {
return m_view->mutableSearchResults();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h
index efde9df0f93cfd4e141519f96ba157728804be7a..2db10904977f3a184167effac8937d8d1e810de8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtCatalogSearcher.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IMainWindowView;
@@ -75,6 +76,7 @@ private:
void searchAsync();
};
bool hasActiveCatalogSession();
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_QTCATALOGSEARCHER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp
index 6438cf23161e56867aec888cfd23b700d8ee2217..1c79c7b9eea53880c32b6f467e15e00c539920f9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.cpp
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using namespace Mantid::API;
using namespace MantidQt::MantidWidgets;
using namespace MantidQt::Icons;
@@ -404,5 +405,6 @@ void QtRunsView::startTimer(const int millisecs) {
/** stop
*/
void QtRunsView::stopTimer() { m_timer.stop(); }
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h
index c8686befbd80fd7deb0f3636475ce5c154a2614c..96fb6d903a128c9ed4e32ad4d8bed88b90a85934 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtRunsView.h
@@ -27,6 +27,7 @@ class AlgorithmRunner;
}
namespace CustomInterfaces {
+namespace ISISReflectometry {
using MantidWidgets::SlitCalculator;
@@ -129,6 +130,7 @@ private slots:
void onShowSearchContextMenuRequested(const QPoint &pos);
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp
index 2c81dd6054198355c773ce8d2325a74800b44fa1..b783abc6309408e8d1b39f13e4e3ba6201852717 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using namespace Mantid::API;
namespace { // unnamed
@@ -217,5 +218,6 @@ bool QtSearchModel::runHasError(const SearchResult &run) const {
SearchResult const &QtSearchModel::getRowData(int index) const {
return m_runDetails[index];
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h
index 650feeaeaf00007eeba42780e15857a56ebbf281..16146ab747de3b27b6ee4256c6531a07650c7208 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/QtSearchModel.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtSearchModel : Provides a QAbstractTableModel for a Mantid
ITableWorkspace of Reflectometry search results.
@@ -59,6 +60,7 @@ private:
bool runHasError(const SearchResult &run) const;
void mergeNewResults(std::vector<SearchResult> const &source);
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp
index 923f41c61ad701dd93c3f6a12674703118f83ed7..5542cd6bb8e68f671917c89a4084c8293054826e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.cpp
@@ -30,6 +30,7 @@ using namespace MantidQt::MantidWidgets;
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param mainView :: [input] The view we're managing
@@ -528,5 +529,6 @@ void RunsPresenter::errorHandle(const IAlgorithm *alg,
m_monitorAlg.reset();
updateViewWhenMonitorStopped();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h
index 77076138e727094d924247b9e823ed6782b6b851..5cb2ed7142e31ba1faf9d618da146c6bcd1bc5c6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenter.h
@@ -29,6 +29,7 @@ class ProgressableView;
} // namespace MantidWidgets
namespace CustomInterfaces {
+namespace ISISReflectometry {
// Forward decs
class IMessageHandler;
@@ -179,6 +180,7 @@ private:
void updateViewWhenMonitorStarted();
void updateViewWhenMonitorStopped();
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_RUNSPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h
index 285e1cc29e1648cdfb5563122b5f1e4cd1be2480..b22b1077b9d7aeb1f283ec9f4cc20157a8125d28 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/RunsPresenterFactory.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RunsPresenterFactory {
public:
@@ -44,6 +45,7 @@ private:
IMessageHandler *m_messageHandler;
IPythonRunner *m_pythonRunner;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_RUNSPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp
index eebf01afa365aa32761a03d879278053456ecb03..650c478735cdf29990f619969814e9983d824104 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
SearchResult::SearchResult(const std::string &runNumber,
const std::string &desc, const std::string &loc)
@@ -55,5 +56,6 @@ bool operator==(SearchResult const &lhs, SearchResult const &rhs) {
bool operator!=(SearchResult const &lhs, SearchResult const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h
index 6c60c20f3a2d3ff2ccf5f0ebbe9fa6070e546186..aede6579737979508c692a9d8da1df9f2cd6f029 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Runs/SearchResult.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL SearchResult {
public:
@@ -40,6 +41,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(SearchResult const &lhs,
SearchResult const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(SearchResult const &lhs,
SearchResult const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_SEARCHRESULT_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h
index 09f693d733ed717f770b11479fb6435a0dcf1dcf..c7e245ea2f910a465ca6c21897f9d5ae2a21dd82 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTablePresenter.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IRunsPresenter;
class RunsTable;
@@ -45,6 +46,7 @@ public:
virtual void instrumentChanged(std::string const &instrumentName) = 0;
virtual void settingsChanged() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_IREFLRUNSTABLEPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h
index bfd9f8acbe3b272e1ab23d30581107aae5080262..01c53342512688692dcac91d9ebb16650581960f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/IRunsTableView.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RunsTableViewSubscriber
: public MantidQt::MantidWidgets::Batch::JobTreeViewSubscriber {
@@ -81,6 +82,7 @@ public:
virtual void setProcessButtonEnabled(bool enable) = 0;
virtual void setActionEnabled(Action action, bool enable) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_IBATCHVIEW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
index 3e2c284b817e732f22582412fa56e01608ed92c7..9027e1d638c712e90b7969ebaa18955d6fe6b546 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/JobsViewUpdater.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
std::vector<MantidQt::MantidWidgets::Batch::Cell>
@@ -96,6 +97,7 @@ public:
private:
MantidQt::MantidWidgets::Batch::IJobTreeView &m_view;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_JOBVIEWUPDATER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp
index bc3a8e2bdaf6860b070b58ab77cb1d17d52584bb..a7548ce45e42a98bcfb4765b4ab6e93b595086da 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
QtRunsTableView::QtRunsTableView(std::vector<std::string> const &instruments,
int defaultInstrumentIndex)
@@ -314,5 +315,6 @@ int RunsTableViewFactory::defaultInstrumentFromConfig() const {
return indexOfElseFirst(Mantid::Kernel::ConfigService::Instance().getString(
"default.instrument"));
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h
index 0e9d502542a93d57fb51d291911e3585e919a003..aaa0545a057761629f0ed7beefcd5fa144a74767 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/QtRunsTableView.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL QtRunsTableView : public QWidget,
public IRunsTableView {
@@ -87,6 +88,7 @@ public:
private:
std::vector<std::string> m_instruments;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_QTRUNSTABLEVIEW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp
index b660ff9d6f112109a2dee652c698245d1beac91e..e3c53bf6fa714b73df92c33c95a4f1338db99f63 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using MantidQt::MantidWidgets::Batch::IJobTreeView;
using MantidQt::MantidWidgets::Batch::RowLocation;
@@ -36,5 +37,6 @@ std::unique_ptr<RegexFilter> filterFromRegexString(std::string const ®ex,
ReductionJobs const &jobs) {
return std::make_unique<RegexFilter>(boost::regex(regex), view, jobs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h
index bc8c298cd7c1de9e484cf9cc10e273bba6de097c..2ad5f4540d8b251cbb854b838298c3b7625f8990 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RegexRowFilter.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class RegexFilter : public MantidQt::MantidWidgets::Batch::RowPredicate {
public:
@@ -37,6 +38,7 @@ std::unique_ptr<RegexFilter>
filterFromRegexString(std::string const ®ex,
MantidQt::MantidWidgets::Batch::IJobTreeView const &view,
ReductionJobs const &jobs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
index 89ab55c07b1e7c6c8f9e9ef1139a027f7323496d..866987eb3c329681708153540b362e6830ac0b59 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.cpp
@@ -18,6 +18,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace Colour {
constexpr const char *DEFAULT = "#ffffff"; // white
constexpr const char *INVALID = "#dddddd"; // very pale grey
@@ -874,5 +875,6 @@ void RunsTablePresenter::notifyPlotSelectedStitchedOutputPressed() {
m_plotter.reflectometryPlot(workspaces);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
index a8803b867503581eba66c2cb6251a700fa916ef3..46879f3e07310bc6f9e4c5d1f8160f8cddafd442 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h
@@ -20,6 +20,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL RunsTablePresenter
: public IRunsTablePresenter,
@@ -163,6 +164,7 @@ private:
IRunsPresenter *m_mainPresenter;
const IPlotter &m_plotter;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RUNSTABLEPRESENTER_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp
index 30f7642755f05e622867138f2097a85f011302d6..4176cd4afc4c8e71cf1d3c498325d7254b7e46ee 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
RunsTablePresenterFactory::RunsTablePresenterFactory(
std::vector<std::string> const &instruments, double thetaTolerance,
@@ -21,5 +22,6 @@ operator()(IRunsTableView *view) const {
return std::make_unique<RunsTablePresenter>(
view, m_instruments, m_thetaTolerance, ReductionJobs(), m_plotter);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
index 5dfc3dc944eb8a154e856beb7c4cc01f915659de..9e6f061da7a59f90f2afa0ad3c5e80eebcc42abd 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/RunsTable/RunsTablePresenterFactory.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IRunsTableView;
@@ -31,6 +32,7 @@ protected:
double m_thetaTolerance;
Plotter m_plotter;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_BATCHPRESENTERFACTORY_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp
index b84b6915e2192e14f716a41dfb883b027d62320f..7e788cfd64ae869d1f39adc98e9d36f5ecc4a840 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.cpp
@@ -13,6 +13,7 @@
#include <Poco/Path.h>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Mantid::API::IAlgorithm_sptr
AsciiSaver::algorithmForFormat(NamedFormat format) {
@@ -145,5 +146,6 @@ void AsciiSaver::save(std::string const &saveDirectory,
throw InvalidSavePath(saveDirectory);
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h
index 986d09a85d7deb533fa55b8c07b0bc09b4c0df53..c0625cce77241ce80612ed3cf0e1e273bb6df9e9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/AsciiSaver.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class AsciiSaver : public IAsciiSaver {
public:
static Mantid::API::IAlgorithm_sptr algorithmForFormat(NamedFormat format);
@@ -43,6 +44,7 @@ private:
std::vector<std::string> const &logParameters,
FileFormatOptions const &fileFormat) const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_ASCIISAVER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp
index 9d523796ff25ec98401c833800da3c21f0e6bd9f..719ec59d487b4fd88f87e40cb4cc97a4ad28e6d2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.cpp
@@ -7,6 +7,7 @@
#include "IAsciiSaver.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
InvalidSavePath::InvalidSavePath(std::string const &path)
: std::runtime_error("The path" + path +
"does not exist or is not a directory."),
@@ -34,5 +35,6 @@ bool FileFormatOptions::shouldIncludeQResolution() const {
std::string const &FileFormatOptions::separator() const { return m_separator; }
std::string const &FileFormatOptions::prefix() const { return m_prefix; }
NamedFormat FileFormatOptions::format() const { return m_format; }
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h
index 32de2ae835b764fb7a63e8dd8ffbf6940d989fce..7b53dcb587fbfbc5ca4e375f7f81e1baea00cbd4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/IAsciiSaver.h
@@ -13,6 +13,7 @@
#include <vector>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class NamedFormat { Custom, ThreeColumn, ANSTO, ILLCosmos };
@@ -75,6 +76,7 @@ public:
FileFormatOptions const &inputParameters) const = 0;
virtual ~IAsciiSaver() = default;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_IASCIISAVER_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h
index 50e8712fdae4f887e6d975d16a8052e188a07e25..2515b313513647aed0cd1e5730d056fbc4baf251 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISavePresenter.h
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class IBatchPresenter;
@@ -32,6 +33,7 @@ public:
virtual void autoreductionPaused() = 0;
virtual void autoreductionResumed() = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_ISAVEPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h
index b3737ca8d670448a13298fc4fc9229fdecfe13ec..d347a2fabc79caa097e3153ddd84b4e8357b18bf 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/ISaveView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL SaveViewSubscriber {
public:
@@ -71,6 +72,7 @@ public:
virtual void cannotSaveWorkspaces() = 0;
virtual void cannotSaveWorkspaces(std::string const &fullError) = 0;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_ISISREFLECTOMETRY_ISAVEVIEW_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp
index f6185d1e72f8e8a050d5a3960d38a1cefdf4bae6..97ca8bd25ce56cde178bc645b92629cacc318353 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** Constructor
* @param parent :: The parent of this view
@@ -288,5 +289,6 @@ void QtSaveView::cannotSaveWorkspaces() {
void QtSaveView::cannotSaveWorkspaces(std::string const &fullError) {
error("Error", fullError);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h
index 471717cd12ff2a056e1a9b0f1e58c3bb55d58631..104299d21e2180559409e4ef6b3063c1cfacb658 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/QtSaveView.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** QtSaveView : Provides an interface for the "Save ASCII" tab in the
ISIS Reflectometry interface.
@@ -108,6 +109,7 @@ private:
SaveViewSubscriber *m_notifyee;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp
index dbe1fd3751633a062bf187defae4fcee8b9f19cc..78c3209c7596c85c4ed83054c612a2628c3bc61d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.cpp
@@ -21,6 +21,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using namespace Mantid::API;
@@ -267,5 +268,6 @@ std::vector<std::string> SavePresenter::getAvailableWorkspaceNames() {
return validNames;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h
index 9d40018ef960d392ffc778e3fbee26d87468aee3..ccd6b55dfa6d168acfac4ce6f0dbd12ff39eede7 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenter.h
@@ -19,6 +19,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class SavePresenter
@@ -85,6 +86,7 @@ private:
std::unique_ptr<IAsciiSaver> m_saver;
bool m_shouldAutosave;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif /* MANTID_CUSTOMINTERFACES_SAVEPRESENTER_H */
diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h
index 23ab1fcd2086729ef8131733dbce0c24f1c66b36..99bf60f5b262724b66dda7470c8e0554a54041e4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h
+++ b/qt/scientific_interfaces/ISISReflectometry/GUI/Save/SavePresenterFactory.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class SavePresenterFactory {
public:
@@ -23,6 +24,7 @@ public:
std::make_unique<AsciiSaver>());
}
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_SAVEPRESENTERFACTORY_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
index 9474083e97e982476b5082fbbb8f36c341b62b54..04921c305e31c6da00eb2fb59478365b1866e07a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/AllInitialized.h
@@ -10,6 +10,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename Param>
bool allInitialized(boost::optional<Param> const ¶m) {
@@ -32,6 +33,7 @@ makeIfAllInitialized(boost::optional<Params> const &... params) {
return boost::none;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_ALLINITIALIZED_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
index 554a1cbc4b095ae1e224e47b1bb39e69305432f4..06a200553b1980de8bad74faca3a53882bb94707 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/AnalysisMode.h
@@ -10,6 +10,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class AnalysisMode { PointDetector, MultiDetector };
inline AnalysisMode analysisModeFromString(std::string const &analysisMode) {
@@ -30,6 +31,7 @@ inline std::string analysisModeToString(AnalysisMode analysisMode) {
}
throw std::invalid_argument("Unexpected analysis mode");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_ANALYSISMODE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp
index ba429702c24dc6d80db872556ec4ac40141144bc..e90ddc2636f4f7837d70f5da00f6e33bac4fa2d4 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.cpp
@@ -7,6 +7,7 @@
#include "Batch.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Batch::Batch(Experiment const &experiment, Instrument const &instrument,
RunsTable &runsTable, Slicing const &slicing)
@@ -45,5 +46,6 @@ boost::optional<Item &>
Batch::getItemWithOutputWorkspaceOrNone(std::string const &wsName) {
return m_runsTable.getItemWithOutputWorkspaceOrNone(wsName);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h
index 64d53486697a22ff807ab9f26a88e1ed5db1545d..b40ac5079256de160454765844b6a88f53d8b6cb 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Batch.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Batch
@@ -57,6 +58,7 @@ bool Batch::isInSelection(T const &item,
&selectedRowLocations) const {
return m_runsTable.isInSelection(item, selectedRowLocations);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_BATCH_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
index bcc4ffaa525d2662ec87e1178365fd403405cf8a..ca0f9cb10c7718f7b59c6e6738310df159f7341e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.cpp
@@ -7,6 +7,7 @@
#include "DetectorCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
DetectorCorrections::DetectorCorrections(bool correctPositions,
DetectorCorrectionType correctionType)
@@ -30,5 +31,6 @@ bool operator==(DetectorCorrections const &lhs,
return lhs.correctPositions() == rhs.correctPositions() &&
lhs.correctionType() == rhs.correctionType();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
index cfdaef056aa235534f64277d1aefb125f65defdf..76a0d2883ee7ef7dd28f78f780eec3b4984d2a73 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/DetectorCorrections.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class DetectorCorrectionType
@@ -60,6 +61,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(DetectorCorrections const &lhs,
DetectorCorrections const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(DetectorCorrections const &lhs,
DetectorCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_DETECTORCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
index 7648e939c3276b593b6785ee0a9f5c805fda4917..d6d798ba33fb5f8ce33bbe650e8bf522aa491616 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.cpp
@@ -10,6 +10,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Experiment::Experiment()
: m_analysisMode(AnalysisMode::PointDetector),
@@ -124,5 +125,6 @@ bool operator==(Experiment const &lhs, Experiment const &rhs) {
lhs.stitchParameters() == rhs.stitchParameters() &&
lhs.perThetaDefaults() == rhs.perThetaDefaults();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
index 5d657850a7e4ddccc459b308d6330e603fff0a61..c3910595fbbf1be9fec3856f6136bbe1114cd3b2 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Experiment.h
@@ -21,6 +21,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Experiment
@@ -74,6 +75,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Experiment const &lhs,
Experiment const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Experiment const &lhs,
Experiment const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_EXPERIMENT_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp
index fc3f1ce92b6c36be49206fa53c48e2fd75823c39..83f688461b13da3f0d2e0461120a10a1da304914 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.cpp
@@ -7,6 +7,7 @@
#include "FloodCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
FloodCorrections::FloodCorrections(FloodCorrectionType correctionType,
boost::optional<std::string> workspace)
@@ -28,5 +29,6 @@ bool operator==(FloodCorrections const &lhs, FloodCorrections const &rhs) {
return lhs.correctionType() == rhs.correctionType() &&
lhs.workspace() == rhs.workspace();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h
index e0f8e0090085e06a8bac7d375729330a329766c6..65db0caeb951b0117c3187fae5bd72ba648ff5c3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/FloodCorrections.h
@@ -11,6 +11,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class FloodCorrectionType { Workspace, ParameterFile };
inline FloodCorrectionType
@@ -60,6 +61,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(FloodCorrections const &lhs,
FloodCorrections const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(FloodCorrections const &lhs,
FloodCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_FLOODCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp
index 859914f5676e4d3c05d0678cc9b9ee31e1c60012..15e260f84af3baa422ca127acf8271e57d99af2f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Group::Group( // cppcheck-suppress passedByValue
std::string name, std::vector<boost::optional<Row>> rows)
@@ -227,5 +228,6 @@ bool operator==(Group const &lhs, Group const &rhs) {
lhs.postprocessedWorkspaceName() == rhs.postprocessedWorkspaceName() &&
lhs.rows() == rhs.rows();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h
index afabc34ef432c6b29ac71e9d45af8a5bcbba21b5..d9f4e7edff76b358322f837b1c46980e206572ea 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Group.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Group
@@ -95,6 +96,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Group const &lhs,
Group const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Group const &lhs,
Group const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_GROUP_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
index ba2e46d8ff57386c0282c2fd2a6edfd7bdc4f76d..b2ee01f1a8d5bc6c937ec27e61fdb51fce48e68a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.cpp
@@ -7,6 +7,7 @@
#include "Instrument.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Instrument::Instrument()
: m_wavelengthRange(RangeInLambda(0.0, 0.0)),
@@ -67,5 +68,6 @@ bool operator==(Instrument const &lhs, Instrument const &rhs) {
lhs.monitorCorrections() == rhs.monitorCorrections() &&
lhs.detectorCorrections() == rhs.detectorCorrections();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
index c72404ef278cefbb7ad950134eeca7cbd98fe6da..255297f7167bea81ee82994b3f3064deb5153d1b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Instrument.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Instrument
@@ -48,6 +49,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Instrument const &lhs,
Instrument const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Instrument const &lhs,
Instrument const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_INSTRUMENT_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp
index e38e8a2e139e0c6041a9a0af20d2cb8e538b689f..ae1482e4e80b3c0698fa6c149e68c8ea71253027 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Item::Item() : m_itemState(), m_skipped(false) {}
@@ -66,5 +67,6 @@ bool Item::requiresProcessing(bool reprocessFailed) const {
}
return false;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h
index 8ac74b647386ab63ee7c117742ce53c96a701c41..abda539341a053c552f31f45f98e058ca3b241f3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Item.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Item
@@ -55,6 +56,7 @@ protected:
ItemState m_itemState;
bool m_skipped;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACE_ITEM_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp
index d5f152dfa79abea097b84f4e5b3837ec1e552b87..fe37635c6b74750aeece97903c4e6d7b8797ebd1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
ItemState::ItemState()
: m_state(State::ITEM_NOT_STARTED), m_message(boost::none),
@@ -48,5 +49,6 @@ void ItemState::reset() {
m_state = State::ITEM_NOT_STARTED;
m_message = std::string();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h
index 79631701537fcce5d0c620d33cc2cb6dc2097e34..725f1a083c82f4ef311079a8629029083727e92a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ItemState.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class State {
ITEM_NOT_STARTED,
@@ -51,6 +52,7 @@ private:
bool requiresMessage() const;
};
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACE_STATE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
index b980ac82f4d180d341d1bc10e64edc6e0604cfa1..14b114d9c77c9d99217fd81af1f065ee03304ae5 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.cpp
@@ -7,6 +7,7 @@
#include "MonitorCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
MonitorCorrections::MonitorCorrections(
size_t monitorIndex, bool integrate,
@@ -37,5 +38,6 @@ bool operator==(MonitorCorrections const &lhs, MonitorCorrections const &rhs) {
lhs.backgroundRange() == rhs.backgroundRange() &&
lhs.integralRange() == rhs.integralRange();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
index 650e79660f2a70278f849d1b364be07e02977ee2..02ff38053764d10463eae5ceee9213c49d2351ef 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/MonitorCorrections.h
@@ -11,6 +11,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class MonitorCorrections
@@ -39,6 +40,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(MonitorCorrections const &lhs,
MonitorCorrections const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(MonitorCorrections const &lhs,
MonitorCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_MONITORCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
index 9fabb1b0bd971db5e3cbd8efdb8f38db9916c154..3ad0a93c5b93f8bf4905833f1d76b287ec7244be 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.cpp
@@ -13,6 +13,7 @@
#include <set>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace { // unnamed
boost::optional<std::vector<std::string>>
@@ -194,5 +195,6 @@ parseTransmissionRuns(std::string const &firstTransmissionRun,
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
index fe5e97e929dab4f71e3560f717616b58110ec982..80ae86b717930aee5ca1fd5835a2748d34e41680 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ParseReflectometryStrings.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
MANTIDQT_ISISREFLECTOMETRY_DLL boost::optional<std::vector<std::string>>
parseRunNumbers(std::string const &runNumbers);
@@ -52,6 +53,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL
boost::optional<boost::optional<std::string>>
parseProcessingInstructions(std::string const &instructions);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PARSEREFLECTOMETRYSTRINGS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
index 79e2fd284c12c477bbfa78b377a920cc796a649a..10b17fd1fadcbf4ba1911119ea31f8851fda9aef 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
PerThetaDefaults::PerThetaDefaults(
boost::optional<double> theta,
@@ -84,5 +85,6 @@ perThetaDefaultsToArray(PerThetaDefaults const &perThetaDefaults) {
result[8] = *perThetaDefaults.processingInstructions();
return result;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
index dce78c52f22872d830313352a652d35ce8680ad4..0d0e54bd7e319bec661502f31bc89bea6d158496 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PerThetaDefaults.h
@@ -15,6 +15,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class PerThetaDefaults
@@ -73,6 +74,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(PerThetaDefaults const &lhs,
PerThetaDefaults const &rhs);
PerThetaDefaults::ValueArray
perThetaDefaultsToArray(PerThetaDefaults const &perThetaDefaults);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PERTHETADEFAULTS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
index c49cc0e5931a6906aec46a73803f858d0d04627f..c5defaa43ee632a0563ec688ec4c775863bfd47a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.cpp
@@ -7,6 +7,7 @@
#include "PolarizationCorrections.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
PolarizationCorrections::PolarizationCorrections(
PolarizationCorrectionType correctionType)
@@ -25,5 +26,6 @@ bool operator==(PolarizationCorrections const &lhs,
PolarizationCorrections const &rhs) {
return lhs.correctionType() == rhs.correctionType();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
index 8c6a5f3074b79141cb259fe5b977a7141c7083b3..809b61236400f31901bcac0737caab8ed2c1b355 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/PolarizationCorrections.h
@@ -12,6 +12,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
enum class PolarizationCorrectionType { None, ParameterFile };
inline PolarizationCorrectionType
@@ -58,6 +59,7 @@ operator==(PolarizationCorrections const &lhs,
MANTIDQT_ISISREFLECTOMETRY_DLL bool
operator!=(PolarizationCorrections const &lhs,
PolarizationCorrections const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_POLARIZATIONCORRECTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h
index 04364d245ac014b21406304266c356cccbe5370e..bcc0b772ded31cd0e2b282f21bba12286ea82970 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ProcessingInstructions.h
@@ -11,11 +11,13 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** For now processing instructions are just a string but we expect them to
become more complicated so this can be changed to a class in the future
*/
using ProcessingInstructions = std::string;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PROCESSINGINSTRUCTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
index e6414ffc871cc857a9b93cd791b12743a2f688d2..812a66517f11ec8e8bf92a99fbc3c505184f67a6 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.cpp
@@ -8,6 +8,7 @@
#include "MantidKernel/Tolerance.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
RangeInLambda::RangeInLambda(double min, double max) : m_min(min), m_max(max) {}
@@ -39,5 +40,6 @@ bool operator==(RangeInLambda const &lhs, RangeInLambda const &rhs) {
bool operator!=(RangeInLambda const &lhs, RangeInLambda const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
index 315d54e036d6e65d728f8006c0c6d260f7c0474d..2eadf11f22e2dd21c77ee38ec28a3daf1df71495 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInLambda.h
@@ -9,6 +9,7 @@
#include "Common/DllConfig.h"
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL RangeInLambda {
public:
@@ -30,6 +31,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(RangeInLambda const &lhs,
RangeInLambda const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(RangeInLambda const &lhs,
RangeInLambda const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RANGEINLAMBDA_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp
index 7cd433b5ff23c066ccdd0f8912d4f6044a8b55a1..62a3781126ce0de34bc477916dfc8909932ed798 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.cpp
@@ -8,6 +8,7 @@
#include <cassert>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
RangeInQ::RangeInQ(boost::optional<double> min, boost::optional<double> step,
boost::optional<double> max)
@@ -29,5 +30,6 @@ bool operator==(RangeInQ const &lhs, RangeInQ const &rhs) {
bool operator!=(RangeInQ const &lhs, RangeInQ const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h
index 1c3928c196315dd65b5931ce8ebbf96f818da880..35edd7d40ad8ea1216dab0558ecfa613b98c7bad 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RangeInQ.h
@@ -11,6 +11,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL RangeInQ {
public:
@@ -32,6 +33,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(RangeInQ const &lhs,
RangeInQ const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(RangeInQ const &lhs,
RangeInQ const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RANGEINQ_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
index 698dac1a21dbaa26cad1cee3ff6d4bc89c054aa3..70e9fc6f5416171cf76484a68f7a789dc7ce6b38 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
Group &findOrMakeGroupWithName(ReductionJobs &jobs,
@@ -331,5 +332,6 @@ bool operator!=(ReductionJobs const &lhs, ReductionJobs const &rhs) {
bool operator==(ReductionJobs const &lhs, ReductionJobs const &rhs) {
return lhs.groups() == rhs.groups();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h
index 80184e164efb5d94a22b6e0449e7b255ba13eb4c..3c149b9b40d35d99b0ac2292b4b6536b287964b3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionJobs.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class ReductionJobs
@@ -114,6 +115,7 @@ void mergeJobsInto(ReductionJobs &intoHere, ReductionJobs const &fromHere,
listener.groupRemoved(0);
}
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
index bac6b7af563cded15bff9e22f341b15baab2270c..1cafcd97e669806cc1e27415716b748da64fa5d9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionOptionsMap.h
@@ -9,11 +9,13 @@
#include <map>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** The ReductionOptionsMap holds information relating to the settings
* in the Options column in the runs table. These are user-specified
* options specified as key=value pairs.
*/
using ReductionOptionsMap = std::map<std::string, std::string>;
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONOPTIONSMAP_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
index 822cd3470c3a1fc4ad4ae9ac3bc04d5a46b14860..7a2402dcf69e848a8233f0ded70364f7419f8e4c 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionType.h
@@ -10,6 +10,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** The ReductionType determines what type of reduction is to be performed
* by the reduction algorithm
*/
@@ -37,6 +38,7 @@ inline std::string reductionTypeToString(ReductionType reductionType) {
}
throw std::invalid_argument("Unexpected reduction type");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONTYPE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp
index 63c9933b92ba047eb44f1c55c3d86277869b6a0b..dc067b646b365240546b137edaa54ea08414552e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
ReductionWorkspaces::ReductionWorkspaces(
// cppcheck-suppress passedByValue
std::vector<std::string> inputRunNumbers,
@@ -90,5 +91,6 @@ std::string postprocessedWorkspaceName(
});
return boost::algorithm::join(summedRunList, "_");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h
index c9afa96961e5e886c5ad6c8ae983c62b9432b0df..572cec16111fe7f99cb0d90561b6a14d8cfd4b11 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ReductionWorkspaces.h
@@ -17,6 +17,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class ReductionWorkspaces
@@ -62,6 +63,7 @@ workspaceNames(std::vector<std::string> const &inputRunNumbers,
MANTIDQT_ISISREFLECTOMETRY_DLL std::string postprocessedWorkspaceName(
std::vector<std::vector<std::string> const *> const &summedRunNumbers);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_REDUCTIONWORKSPACES_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp
index 4eacb2b8cd7f828238a1de801f670375aea05dfa..a239ec73198758988056b923fc62a3f293376b1b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.cpp
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
Row::Row( // cppcheck-suppress passedByValue
std::vector<std::string> runNumbers, double theta,
@@ -117,5 +118,6 @@ bool operator==(Row const &lhs, Row const &rhs) {
lhs.reducedWorkspaceNames() == rhs.reducedWorkspaceNames() &&
lhs.reductionOptions() == rhs.reductionOptions();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
index d6a0e39368223ef59eec4a843ab9b0183a792b06..cdc70f3101c495938807b0033bce86c9806b3db3 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Row.h
@@ -20,6 +20,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class Row
@@ -69,6 +70,7 @@ private:
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(Row const &lhs, Row const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(Row const &lhs, Row const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL Row mergedRow(Row const &rowA, Row const &rowB);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACE_RUN_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp
index f7c74c55673f17ce649c31cf60732f53c129eabf..645baacf42fd587dc4d203450a3a882ede8e13e9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.cpp
@@ -10,6 +10,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T>
void sortAndRemoveDuplicatesInplace(std::vector<T> &items) {
@@ -68,5 +69,6 @@ bool containsPath(
[&path](MantidQt::MantidWidgets::Batch::RowLocation const &location)
-> bool { return location.path() == path; });
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h
index 2b1bee043efbdec26cc908dc72e7720e43730f94..91d4fa340668adb6bc9f77c680d57288c89a7953 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RowLocation.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
std::vector<int> groupIndexesFromSelection(
std::vector<MantidWidgets::Batch::RowLocation> const &selected);
@@ -28,6 +29,7 @@ int rowOf(MantidQt::MantidWidgets::Batch::RowLocation const &rowLocation);
bool containsPath(
std::vector<MantidQt::MantidWidgets::Batch::RowLocation> const &locations,
MantidQt::MantidWidgets::Batch::RowPath const &path);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_ISISREFLECTOMETRY_ROWLOCATION_H
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp
index e8af16eb7c799b7d57b9d01e49dd43415b01dafc..101d671004a5bb0a23fcc9be0d3a126fbaaecb18 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
using MantidWidgets::Batch::RowLocation;
@@ -66,5 +67,6 @@ std::vector<Row> RunsTable::selectedRows() const {
}
return rows;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h
index cefd139ffcdf7c4dd2f1eccdee92497d22f76e67..d4782d0ffbf85f338b8424df50e95cab49fdd552 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/RunsTable.h
@@ -16,6 +16,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class RunsTable
@@ -60,6 +61,7 @@ bool RunsTable::isInSelection(
auto const path = m_reductionJobs.getPath(item);
return containsPath(selectedRowLocations, path);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_RUNSTABLE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
index 9c81767525ddb26b934cb2cd8b75d1d4c4382855..17bd9ec11802fe01ade97a1ea51a83aa7db96422 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
UniformSlicingByTime::UniformSlicingByTime(double secondsPerSlice)
: m_secondsPerSlice(secondsPerSlice) {}
@@ -115,5 +116,6 @@ std::ostream &operator<<(std::ostream &os, SlicingByEventLog const &slicing) {
}
return os;
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
index 7e32b115c6ad97ba7f93910167fa400ccc3942ff..2e7861be504d7a6fc097218c1fd4b69c1fd96f48 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/Slicing.h
@@ -15,6 +15,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
class MANTIDQT_ISISREFLECTOMETRY_DLL UniformSlicingByTime {
public:
@@ -97,6 +98,7 @@ using Slicing =
MANTIDQT_ISISREFLECTOMETRY_DLL bool isInvalid(Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isValid(Slicing const &slicing);
MANTIDQT_ISISREFLECTOMETRY_DLL bool isNoSlicing(Slicing const &slicing);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
index 0478836512262d6363d33648d7f4097286ce5d32..1e1125f3cb63d864c2763fbdab77857c5fb55384 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/SummationType.h
@@ -12,6 +12,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** SummationType holds information about what type of summation should be
* done in the reduction
@@ -36,6 +37,7 @@ inline std::string summationTypeToString(SummationType summationType) {
}
throw std::invalid_argument("Unexpected summation type");
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_SUMMATIONTYPE_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp
index 8cc2c4c842d6377c93fb1b3fe7218a6691e0f3ff..74cb29ff40b614882576c0c4241c0bde9bfdc1e9 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
TransmissionRunPair::TransmissionRunPair()
: m_firstTransmissionRunNumbers(), m_secondTransmissionRunNumbers() {}
@@ -58,5 +59,6 @@ bool operator!=(TransmissionRunPair const &lhs,
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
index 1e70438e91b0dc074c5b59371604c57a6aac7e77..337f607a8629463c4f8687a55390db80f02366a0 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionRunPair.h
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class TransmissionRunPair
The TransmissionRunPair model holds information about the two possible
@@ -41,6 +42,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL bool operator==(TransmissionRunPair const &lhs,
TransmissionRunPair const &rhs);
MANTIDQT_ISISREFLECTOMETRY_DLL bool operator!=(TransmissionRunPair const &lhs,
TransmissionRunPair const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_TRANSMISSIONRUNPAIR_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp
index feb0e680aafb29272d1452a4d3ceb576ed15bd32..8a6ba8d4a24d13fe72e127845faaa1af776d075f 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.cpp
@@ -8,6 +8,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
TransmissionStitchOptions::TransmissionStitchOptions()
: m_overlapRange(boost::none), m_rebinParameters(), m_scaleRHS(false) {}
@@ -39,5 +40,6 @@ bool operator!=(TransmissionStitchOptions const &lhs,
TransmissionStitchOptions const &rhs) {
return !(lhs == rhs);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h
index 321fd7ca9ce913fb1b0bf6b3b6caba439a9c2d21..3fe2fba42ee80baff0033b289d3554ee268fb3d8 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/TransmissionStitchOptions.h
@@ -13,6 +13,7 @@
#include <string>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
// For now just pass rebin params as a string but in future we may want to
// expand this
@@ -46,6 +47,7 @@ operator==(TransmissionStitchOptions const &lhs,
MANTIDQT_ISISREFLECTOMETRY_DLL bool
operator!=(TransmissionStitchOptions const &lhs,
TransmissionStitchOptions const &rhs);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_TRANSMISSIONSTITCHOPTIONS_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
index 7c0912344f8f4523978b38af3722810b1600ce85..38015c3ff51dd657678738b86e896abf5e9b73e1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.cpp
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
template <typename T>
class AppendErrorIfNotType : public boost::static_visitor<boost::optional<T>> {
@@ -130,5 +131,6 @@ validatePerThetaDefaults(CellText const &cells) {
auto validate = PerThetaDefaultsValidator();
return validate(cells);
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
index 1fc87cca4dc9c590ac01cc6df25337e61a4f9fcc..1e99a7c1a9c28f9514e2a3ca8a72bd7f9b73aace 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidatePerThetaDefaults.h
@@ -16,6 +16,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class PerThetaDefaultsValidator
@@ -50,6 +51,7 @@ private:
ValidationResult<PerThetaDefaults, std::vector<int>>
validatePerThetaDefaults(PerThetaDefaults::ValueArray const &cellText);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_PERTHETADEFAUTSVALIDATOR_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
index 55adeed3b61eaf2cc38b04258f6181d35190f2bd..ab8dfa8631a300beb4f4be7734311c46af93d61e 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.cpp
@@ -13,6 +13,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace {
enum ColumnNumber {
@@ -145,5 +146,6 @@ boost::optional<Row> validateRowFromRunAndTheta(std::string const &run,
std::vector<std::string> cells = {run, theta, "", "", "", "", "", "", ""};
return validateRow(cells).validElseNone();
}
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
index 3dcb7279b7e2fa2c12603d6aad100cc447518be6..7f5f9af9f0fefd42ae0f2a77d79cea48fdc3e7d1 100644
--- a/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
+++ b/qt/scientific_interfaces/ISISReflectometry/Reduction/ValidateRow.h
@@ -16,6 +16,7 @@
#include <boost/optional.hpp>
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
/** @class RowValidator
@@ -49,6 +50,7 @@ RowValidationResult validateRow(std::vector<std::string> const &cellText);
boost::optional<Row> validateRowFromRunAndTheta(std::string const &run,
std::string const &theta);
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_VALIDATEROW_H_
diff --git a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp
index 8069723ca3e342c62266e3b0be3db3476518c3ef..426f2598320fd600d11059f29f00a5f1eeb1691a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.cpp
@@ -9,6 +9,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace ModelCreationHelper {
namespace { // unnamed
@@ -381,5 +382,6 @@ Instrument makeEmptyInstrument() {
DetectorCorrections(false, DetectorCorrectionType::VerticalShift));
}
} // namespace ModelCreationHelper
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
diff --git a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h
index be183063dd0198b8942fb26ee28e7d3377924250..a6803b9ebe6a42d2ed83499353e84a1ec3b5438b 100644
--- a/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h
+++ b/qt/scientific_interfaces/ISISReflectometry/TestHelpers/ModelCreationHelper.h
@@ -14,6 +14,7 @@
namespace MantidQt {
namespace CustomInterfaces {
+namespace ISISReflectometry {
namespace ModelCreationHelper {
/* Helper methods to create reduction configuration models for the
@@ -90,6 +91,7 @@ MANTIDQT_ISISREFLECTOMETRY_DLL DetectorCorrections makeDetectorCorrections();
MANTIDQT_ISISREFLECTOMETRY_DLL Instrument makeInstrument();
MANTIDQT_ISISREFLECTOMETRY_DLL Instrument makeEmptyInstrument();
} // namespace ModelCreationHelper
+} // namespace ISISReflectometry
} // namespace CustomInterfaces
} // namespace MantidQt
#endif // MANTID_CUSTOMINTERFACES_MODELCREATIONHELPER_H_