Commit f044de9c authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Reformat codebase with clang-format 6.0

parent 1e924cdb
......@@ -340,7 +340,7 @@ valgrind_do_client_request_expr(uintptr_t _zzq_default, uintptr_t _zzq_request,
#endif /* PLAT_x86_win32 */
/* ------------------------ amd64-{linux,darwin} --------------- */
/* ------------------------ amd64-{linux,darwin} --------------- */
#if defined(PLAT_amd64_linux) || defined(PLAT_amd64_darwin)
......
......@@ -30,9 +30,9 @@
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::CurveFitting::Functions;
using Mantid::CurveFitting::Algorithms::Fit;
using Mantid::CurveFitting::GSLJacobian;
using Mantid::CurveFitting::HistogramDomainCreator;
using Mantid::CurveFitting::Algorithms::Fit;
class HistogramDomainCreatorTest : public CxxTest::TestSuite {
public:
......
......@@ -271,6 +271,6 @@ private:
bool m_corretctTOF;
};
}
} // namespace DataHandling
} // namespace Mantid
#endif /*FILTEREVENTSBYLOGVALUEPRENEXUS_H_*/
......@@ -219,6 +219,6 @@ private:
/// Processing the input properties for purpose of investigation
void processInvestigationInputs();
};
}
} // namespace DataHandling
} // namespace Mantid
#endif /*LOADEVENTPRENEXUS_H_*/
......@@ -26,23 +26,23 @@ class DefaultEventLoader;
class ProcessBankData : public Mantid::Kernel::Task {
public:
/** Constructor
*
* @param loader :: DefaultEventLoader
* @param entry_name :: name of the bank
* @param prog :: Progress reporter
* @param event_id :: array with event IDs
* @param event_time_of_flight :: array with event TOFS
* @param numEvents :: how many events in the arrays
* @param startAt :: index of the first event from event_index
* @param event_index :: vector of event index (length of # of pulses)
* @param thisBankPulseTimes :: ptr to the pulse times for this particular
*bank.
* @param have_weight :: flag for handling simulated files
* @param event_weight :: array with weights for events
* @param min_event_id ;: minimum detector ID to load
* @param max_event_id :: maximum detector ID to load
* @return
*/ // API::IFileLoader<Kernel::NexusDescriptor>
*
* @param loader :: DefaultEventLoader
* @param entry_name :: name of the bank
* @param prog :: Progress reporter
* @param event_id :: array with event IDs
* @param event_time_of_flight :: array with event TOFS
* @param numEvents :: how many events in the arrays
* @param startAt :: index of the first event from event_index
* @param event_index :: vector of event index (length of # of pulses)
* @param thisBankPulseTimes :: ptr to the pulse times for this particular
*bank.
* @param have_weight :: flag for handling simulated files
* @param event_weight :: array with weights for events
* @param min_event_id ;: minimum detector ID to load
* @param max_event_id :: maximum detector ID to load
* @return
*/ // API::IFileLoader<Kernel::NexusDescriptor>
ProcessBankData(DefaultEventLoader &loader, std::string entry_name,
API::Progress *prog, boost::shared_array<uint32_t> event_id,
boost::shared_array<float> event_time_of_flight,
......
......@@ -60,13 +60,13 @@ using namespace Geometry;
using DataObjects::EventList;
using DataObjects::EventWorkspace;
using DataObjects::EventWorkspace_sptr;
using Types::Core::DateAndTime;
using Types::Event::TofEvent;
using std::ifstream;
using std::runtime_error;
using std::string;
using std::stringstream;
using std::vector;
using Types::Core::DateAndTime;
using Types::Event::TofEvent;
//----------------------------------------------------------------------------------------------
// constants for locating the parameters to use in execution
......
......@@ -32,7 +32,7 @@ const char *URL_PREFIX = "http://data.isis.rl.ac.uk/where.py/windir?name=";
#else
const char *URL_PREFIX = "http://data.isis.rl.ac.uk/where.py/unixdir?name=";
#endif
}
} // namespace
/**
* Query the ISIS archive for a set of filenames and vector of extensions. The
......
......@@ -23,8 +23,8 @@
#include <Poco/DOM/NodeList.h>
#include <Poco/SAX/InputSource.h>
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::DOMParser;
using Poco::XML::Element;
using Poco::XML::Node;
using Poco::XML::NodeList;
......
......@@ -37,8 +37,8 @@ using Mantid::DataObjects::GroupingWorkspace_sptr;
using Mantid::DataObjects::MaskWorkspace_sptr;
using Mantid::DataObjects::Workspace2D;
using Mantid::Kernel::Direction;
using Mantid::Kernel::Exception::FileError;
using Mantid::Kernel::PropertyWithValue;
using Mantid::Kernel::Exception::FileError;
using namespace H5;
......
......@@ -58,13 +58,13 @@ using namespace DataObjects;
using DataObjects::EventList;
using DataObjects::EventWorkspace;
using DataObjects::EventWorkspace_sptr;
using Types::Core::DateAndTime;
using Types::Event::TofEvent;
using std::ifstream;
using std::runtime_error;
using std::string;
using std::stringstream;
using std::vector;
using Types::Core::DateAndTime;
using Types::Event::TofEvent;
//------------------------------------------------------------------------------------------------
// constants for locating the parameters to use in execution
......
......@@ -20,8 +20,8 @@
#include <Poco/Path.h>
#include <nexus/NeXusFile.hpp>
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::DOMParser;
using Poco::XML::Element;
using Poco::XML::NodeList;
......
......@@ -401,8 +401,8 @@ bool LoadNGEM::reportProgressAndCheckCancel(size_t &numProcessedEvents,
void LoadNGEM::createCountWorkspace(
const std::vector<double> &frameEventCounts) {
std::vector<double> xAxisCounts(frameEventCounts.size() + 1);
std::generate(xAxisCounts.begin(),
xAxisCounts.end(), [n = 0.0]() mutable { return ++n; });
std::generate(xAxisCounts.begin(), xAxisCounts.end(),
[n = 0.0]() mutable { return ++n; });
DataObjects::Workspace2D_sptr countsWorkspace =
DataObjects::create<DataObjects::Workspace2D>(
......
......@@ -32,8 +32,8 @@ using API::FileProperty;
using API::MatrixWorkspace;
using API::MatrixWorkspace_sptr;
using API::WorkspaceProperty;
using Types::Core::DateAndTime;
using std::size_t;
using Types::Core::DateAndTime;
// Anonymous namespace
namespace {
......
......@@ -11,8 +11,8 @@
#include "MantidAPI/Workspace.h"
#include "MantidAPI/WorkspaceGroup.h"
using Mantid::API::WorkspaceGroup;
using Mantid::API::Workspace_sptr;
using Mantid::API::WorkspaceGroup;
namespace Mantid {
namespace DataHandling {
......
......@@ -24,8 +24,8 @@
using Mantid::Geometry::InstrumentDefinitionParser;
using Poco::XML::AutoPtr;
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::DOMParser;
using Poco::XML::Element;
namespace Mantid {
......
......@@ -116,9 +116,9 @@ void vax_to_local_ints(fort_int *ia, const fort_int *n) {
(void)n; // Avoid compiler warning
}
/*
* determine a few things we need to know to write machine independent data
*/
/*
* determine a few things we need to know to write machine independent data
*/
#ifndef __VMS
#define IEEEFP 1
......
......@@ -43,8 +43,8 @@
#include <utility>
#include <vector>
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::DOMParser;
using Poco::XML::Element;
namespace Mantid {
......
......@@ -30,8 +30,8 @@ using namespace Kernel;
using namespace API;
using namespace DataObjects;
using HistogramData::BinEdges;
using HistogramData::CountStandardDeviations;
using HistogramData::Counts;
using HistogramData::CountStandardDeviations;
LoadTOFRawNexus::LoadTOFRawNexus()
: m_numPixels(0), m_signalNo(0), pulseTimes(0), m_numBins(0), m_spec_min(0),
......
......@@ -25,8 +25,8 @@ using boost::algorithm::ends_with;
using Mantid::Catalog::Exception::CatalogError;
using Mantid::Catalog::ONCat::ONCat;
using Mantid::Catalog::ONCat::ONCatEntity;
using Mantid::Catalog::ONCat::ONCat_uptr;
using Mantid::Catalog::ONCat::ONCatEntity;
using Mantid::Catalog::ONCat::QueryParameter;
using Mantid::Catalog::ONCat::QueryParameters;
......
......@@ -38,14 +38,14 @@ using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::DataObjects;
using namespace Mantid::HistogramData;
using Mantid::detid_t;
using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::Counts;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::Histogram;
using Mantid::HistogramData::HistogramX;
using Mantid::HistogramData::LinearGenerator;
using Mantid::Types::Event::TofEvent;
using Mantid::detid_t;
class GroupDetectors2Test : public CxxTest::TestSuite {
public:
......
Supports Markdown
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