Commit 9ac42d37 authored by Nick Draper's avatar Nick Draper
Browse files

clang format whitespace changes

parent 98cdc389
......@@ -176,7 +176,6 @@ FileLoaderRegistryImpl::FileLoaderRegistryImpl()
: m_names(2, std::multimap<std::string, int>()), m_totalSize(0),
m_log("FileLoaderRegistry") {}
FileLoaderRegistryImpl::~FileLoaderRegistryImpl() = default;
/**
......
......@@ -11,7 +11,6 @@ namespace Mantid {
namespace API {
const std::string IEventWorkspace::toString() const {
std::ostringstream os;
os << MatrixWorkspace::toString() << "\n";
......
......@@ -96,7 +96,6 @@ signal_t IMDWorkspace::getSignalWithMaskAtVMD(
//-----------------------------------------------------------------------------------------------
const std::string IMDWorkspace::toString() const {
std::ostringstream os;
os << id() << "\n"
......
......@@ -96,7 +96,6 @@ void EstimateResolutionDiffraction::init() {
"Workspaces created showing the various resolution terms");
}
void EstimateResolutionDiffraction::exec() {
processAlgProperties();
......@@ -131,7 +130,6 @@ void EstimateResolutionDiffraction::exec() {
setProperty("PartialResolutionWorkspaces", partialsGroup);
}
void EstimateResolutionDiffraction::processAlgProperties() {
m_inputWS = getProperty("InputWorkspace");
m_divergenceWS = getProperty("DivergenceWorkspace");
......@@ -165,7 +163,6 @@ double EstimateResolutionDiffraction::getWavelength() {
return cwltimeseries->timeAverageValue();
}
void EstimateResolutionDiffraction::retrieveInstrumentParameters() {
double centrewavelength = getWavelength();
g_log.notice() << "Centre wavelength = " << centrewavelength << " Angstrom\n";
......@@ -178,7 +175,6 @@ void EstimateResolutionDiffraction::retrieveInstrumentParameters() {
g_log.notice() << "Centre neutron velocity = " << m_centreVelocity << "\n";
}
void EstimateResolutionDiffraction::estimateDetectorResolution() {
const auto &spectrumInfo = m_inputWS->spectrumInfo();
const auto l1 = spectrumInfo.l1();
......
......@@ -88,7 +88,6 @@ void MayersSampleCorrection::init() {
"An output workspace.");
}
void MayersSampleCorrection::exec() {
using API::Progress;
using API::WorkspaceFactory;
......
......@@ -304,7 +304,6 @@ void ConvertToYSpace::createOutputWorkspace() {
}
}
void ConvertToYSpace::cacheInstrumentGeometry() {
auto inst = m_inputWS->getInstrument();
auto source = inst->getSource();
......
......@@ -500,7 +500,6 @@ void VesuvioCalculateGammaBackground::createOutputWorkspaces() {
m_correctedWS = WorkspaceFactory::Instance().create(m_inputWS, nhist);
}
void VesuvioCalculateGammaBackground::cacheInstrumentGeometry() {
auto inst = m_inputWS->getInstrument();
auto refFrame = inst->getReferenceFrame();
......
......@@ -37,7 +37,6 @@ const double STDDEV_TO_FWHM = 0.5 * std::sqrt(std::log(4.0));
///@endcond
} // namespace
ComptonPeakProfile::ComptonPeakProfile()
: API::ParamFunction(), API::IFunction1D(), m_wsIndex(0), m_mass(0.0),
m_voigtCutOff(5000.), m_gauss(), m_voigt(), m_efixed(0.0),
......@@ -140,14 +139,12 @@ void ComptonPeakProfile::setWorkspace(
m_hwhmLorentz = 0.5 * (yplus - yminus);
}
void ComptonPeakProfile::declareParameters() {
declareParameter(AMP_PARAM, 1.0, "Intensity parameter");
declareParameter(POS_PARAM, 1.0, "Peak position parameter");
declareParameter(WIDTH_PARAM, 1.0, "Width parameter");
}
void ComptonPeakProfile::declareAttributes() {
declareAttribute(WSINDEX_NAME,
IFunction::Attribute(static_cast<int>(m_wsIndex)));
......
......@@ -28,7 +28,6 @@ const char *MASS_NAME = "Mass";
///@endcond
} // namespace
ComptonProfile::ComptonProfile()
: API::ParamFunction(), API::IFunction1D(), m_log("ComptonProfile"),
m_wsIndex(0), m_startX(0.0), m_endX(0.0), m_voigt(),
......@@ -149,7 +148,6 @@ void ComptonProfile::cacheYSpaceValues(
}
}
void ComptonProfile::declareParameters() {
declareParameter(MASS_NAME, 0.0, "Atomic mass (amu)");
}
......
......@@ -24,7 +24,6 @@ const char *AMP_PARAM = "Intensity";
const double STDDEV_TO_HWHM = std::sqrt(std::log(4.0));
GaussianComptonProfile::GaussianComptonProfile() : ComptonProfile() {}
/**
......@@ -34,14 +33,12 @@ std::string GaussianComptonProfile::name() const {
return "GaussianComptonProfile";
}
void GaussianComptonProfile::declareParameters() {
ComptonProfile::declareParameters();
declareParameter(WIDTH_PARAM, 1.0, "Gaussian width parameter");
declareParameter(AMP_PARAM, 1.0, "Gaussian intensity parameter");
}
std::vector<size_t> GaussianComptonProfile::intensityParameterIndices() const {
return std::vector<size_t>(1, this->parameterIndex(AMP_PARAM));
}
......
......@@ -73,7 +73,6 @@ struct InY {
///@endcond
} // namespace
GramCharlierComptonProfile::GramCharlierComptonProfile()
: ComptonProfile(), m_hermite(), m_yfine(), m_qfine(), m_voigt(),
m_voigtProfile(), m_userFixedFSE(false) {}
......@@ -85,7 +84,6 @@ std::string GramCharlierComptonProfile::name() const {
return "GramCharlierComptonProfile";
}
void GramCharlierComptonProfile::declareParameters() {
// Base class ones
ComptonProfile::declareParameters();
......@@ -94,7 +92,6 @@ void GramCharlierComptonProfile::declareParameters() {
// Other parameters depend on the Hermite attribute...
}
void GramCharlierComptonProfile::declareAttributes() {
// Base class ones
ComptonProfile::declareAttributes();
......@@ -161,7 +158,6 @@ void GramCharlierComptonProfile::declareGramCharlierParameters() {
}
}
std::vector<size_t>
GramCharlierComptonProfile::intensityParameterIndices() const {
assert(!m_hermite.empty());
......
......@@ -25,7 +25,6 @@ const char *MultivariateGaussianComptonProfile::SIGMA_Y_PARAM = "SigmaY";
const char *MultivariateGaussianComptonProfile::SIGMA_Z_PARAM = "SigmaZ";
const char *MultivariateGaussianComptonProfile::STEPS_ATTR = "IntegrationSteps";
MultivariateGaussianComptonProfile::MultivariateGaussianComptonProfile()
: ComptonProfile(), m_integrationSteps(256), m_thetaStep(0.0),
m_phiStep(0.0) {}
......@@ -37,7 +36,6 @@ std::string MultivariateGaussianComptonProfile::name() const {
return "MultivariateGaussianComptonProfile";
}
void MultivariateGaussianComptonProfile::declareParameters() {
ComptonProfile::declareParameters();
declareParameter(AMP_PARAM, 1.0, "Gaussian intensity parameter");
......@@ -46,7 +44,6 @@ void MultivariateGaussianComptonProfile::declareParameters() {
declareParameter(SIGMA_Z_PARAM, 1.0, "Sigma Z parameter");
}
void MultivariateGaussianComptonProfile::declareAttributes() {
ComptonProfile::declareAttributes();
declareAttribute(STEPS_ATTR, IFunction::Attribute(m_integrationSteps));
......@@ -76,7 +73,6 @@ void MultivariateGaussianComptonProfile::setAttribute(const std::string &name,
}
}
std::vector<size_t>
MultivariateGaussianComptonProfile::intensityParameterIndices() const {
return std::vector<size_t>(1, this->parameterIndex(AMP_PARAM));
......
......@@ -187,7 +187,6 @@ void VesuvioResolution::function1D(double *out, const double *xValues,
std::copy(outVec.begin(), outVec.end(), out);
}
void VesuvioResolution::declareAttributes() {
declareAttribute(MASS_NAME, IFunction::Attribute(m_mass));
}
......
......@@ -7,10 +7,9 @@
// Mantid Repository : https://github.com/mantidproject/mantid
//
//
*
*/
** /
class DLLExport SaveNXSPE : public API::Algorithm {
class DLLExport SaveNXSPE : public API::Algorithm {
public:
/// Constructor
SaveNXSPE();
......
......@@ -65,7 +65,6 @@ void LoadDetectorInfo::init() {
Direction::Input);
}
void LoadDetectorInfo::exec() {
cacheInputs();
std::string filename = getPropertyValue("DataFilename");
......
......@@ -149,7 +149,6 @@ void LoadLLB::initWorkSpace(NeXus::NXEntry &entry) {
m_localWorkspace->setYUnitLabel("Counts");
}
void LoadLLB::loadTimeDetails(NeXus::NXEntry &entry) {
m_wavelength = entry.getFloat("nxbeam/incident_wavelength");
......
......@@ -813,7 +813,6 @@ MatrixWorkspace_sptr LoadSpiceXML2DDet::xmlCreateMatrixWorkspaceUnknowGeometry(
return outws;
}
API::MatrixWorkspace_sptr LoadSpiceXML2DDet::xmlParseDetectorNode(
const std::string &detvaluestr, bool loadinstrument, double &max_counts) {
// Split to lines
......
......@@ -83,14 +83,14 @@ public:
void setFileBacked() override;
void clearFileBacked(bool loadDiskBackedData) override;
//-----------------------------------------------------------------------------------------------
void saveAt(API::IBoxControllerIO *const ,
void saveAt(API::IBoxControllerIO *const,
uint64_t /*position*/) const override;
void loadAndAddFrom(API::IBoxControllerIO *const , uint64_t /*position*/,
void loadAndAddFrom(API::IBoxControllerIO *const, uint64_t /*position*/,
size_t /* Size */) override;
void reserveMemoryForLoad(uint64_t /* Size */) override;
/**drop events data from memory but keep averages (and file-backed info) */
void clearDataFromMemory() override;
void clear() override;
uint64_t getNPoints() const override;
......
......@@ -77,12 +77,12 @@ public:
}
/**Save the box at specific disk position using the class, respoinsible for
* the file IO. */
void saveAt(API::IBoxControllerIO *const ,
void saveAt(API::IBoxControllerIO *const,
uint64_t /*position*/) const override { /*Not saveable */
}
/**Load the box data of specified size from the disk location provided using
* the class, respoinsible for the file IO. */
void loadAndAddFrom(API::IBoxControllerIO *const , uint64_t /*position*/,
void loadAndAddFrom(API::IBoxControllerIO *const, uint64_t /*position*/,
size_t /* Size */) override { /*Not directly loadable */
}
void reserveMemoryForLoad(
......
......@@ -42,9 +42,9 @@ public:
const bool /*markSaved*/) override{};
void clearFileBacked(bool /* loadData*/) override{/**does nothing*/};
void setFileBacked() override{};
void saveAt(API::IBoxControllerIO *const ,
void saveAt(API::IBoxControllerIO *const,
uint64_t /*position*/) const override{/*Not saveable */};
void loadAndAddFrom(API::IBoxControllerIO *const , uint64_t /*position*/,
void loadAndAddFrom(API::IBoxControllerIO *const, uint64_t /*position*/,
size_t /* Size */) override{};
void reserveMemoryForLoad(uint64_t /* Size */) override{};
// regardless of what is actually instantiated, base tester would call itself
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment