From adf67d4c0ba0811950cba585afb397db2ee50d64 Mon Sep 17 00:00:00 2001
From: Lamar Moore <lamar.moore@stfc.ac.uk>
Date: Mon, 14 Dec 2015 12:18:06 +0000
Subject: [PATCH] Re #14773 Clang Format fix
---
Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp | 2 +-
Framework/DataHandling/src/SetScalingPSD.cpp | 3 ++-
Framework/DataHandling/src/UpdateInstrumentFromFile.cpp | 3 ++-
Framework/MDAlgorithms/src/CreateMDWorkspace.cpp | 2 +-
Framework/MDAlgorithms/src/LoadMD.cpp | 2 +-
Framework/MDAlgorithms/src/SaveIsawQvector.cpp | 2 +-
Framework/MDAlgorithms/src/SaveMD.cpp | 2 +-
Framework/MDAlgorithms/src/SaveMD2.cpp | 2 +-
Framework/MDAlgorithms/src/SaveZODS.cpp | 2 +-
Framework/MDAlgorithms/src/SliceMD.cpp | 3 ++-
Framework/SINQ/src/LoadFlexiNexus.cpp | 8 +++++---
Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp | 3 ++-
Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp | 6 +++---
.../WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp | 8 ++++----
14 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp b/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
index c4f556f5418..3cfb457263c 100644
--- a/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
+++ b/Framework/DataHandling/src/SaveToSNSHistogramNexus.cpp
@@ -48,7 +48,7 @@ SaveToSNSHistogramNexus::SaveToSNSHistogramNexus()
void SaveToSNSHistogramNexus::init() {
// Declare required parameters, filename with ext {.nx,.nx5,xml} and input
// workspac
- std::initializer_list<std::string> exts = { ".nxs" };
+ std::initializer_list<std::string> exts = {".nxs"};
declareProperty(
new FileProperty("InputFilename", "", FileProperty::Load, exts),
diff --git a/Framework/DataHandling/src/SetScalingPSD.cpp b/Framework/DataHandling/src/SetScalingPSD.cpp
index a074b5aa619..70426f72bb8 100644
--- a/Framework/DataHandling/src/SetScalingPSD.cpp
+++ b/Framework/DataHandling/src/SetScalingPSD.cpp
@@ -32,7 +32,8 @@ SetScalingPSD::SetScalingPSD() : Algorithm(), m_scalingOption(0) {}
void SetScalingPSD::init() {
// Declare required input parameters for algorithm
declareProperty(
- new FileProperty("ScalingFilename", "", FileProperty::Load, {".sca", ".raw"}),
+ new FileProperty("ScalingFilename", "", FileProperty::Load,
+ {".sca", ".raw"}),
"The name of the scaling calibrations file to read, including its\n"
"full or relative path. The file extension must be either .sca or\n"
".raw (filenames are case sensitive on linux)");
diff --git a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
index d7274debee6..2a6f7be6f7b 100644
--- a/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
+++ b/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
@@ -44,7 +44,8 @@ void UpdateInstrumentFromFile::init() {
new WorkspaceProperty<MatrixWorkspace>("Workspace", "Anonymous",
Direction::InOut),
"The name of the workspace in which to store the imported instrument");
- declareProperty(new FileProperty("Filename", "", FileProperty::Load, {".raw", ".nxs", ".s*"}),
+ declareProperty(new FileProperty("Filename", "", FileProperty::Load,
+ {".raw", ".nxs", ".s*"}),
"The filename of the input file.\n"
"Currently supports RAW, ISIS NeXus, DAT & multi-column (at "
"least 2) ascii files");
diff --git a/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp b/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
index edc216332db..129dbe5e181 100644
--- a/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
@@ -86,7 +86,7 @@ void CreateMDWorkspace::init() {
Direction::Output),
"Name of the output MDEventWorkspace.");
declareProperty(
- new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
+ new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
"Optional: to use a file as the back end, give the path to the file to "
"save.");
diff --git a/Framework/MDAlgorithms/src/LoadMD.cpp b/Framework/MDAlgorithms/src/LoadMD.cpp
index c2119976360..81158d0064b 100644
--- a/Framework/MDAlgorithms/src/LoadMD.cpp
+++ b/Framework/MDAlgorithms/src/LoadMD.cpp
@@ -82,7 +82,7 @@ int LoadMD::confidence(Kernel::NexusDescriptor &descriptor) const {
*/
void LoadMD::init() {
declareProperty(
- new FileProperty("Filename", "", FileProperty::Load, {".nxs"}),
+ new FileProperty("Filename", "", FileProperty::Load, {".nxs"}),
"The name of the Nexus file to load, as a full or relative path");
declareProperty(new Kernel::PropertyWithValue<bool>("MetadataOnly", false),
diff --git a/Framework/MDAlgorithms/src/SaveIsawQvector.cpp b/Framework/MDAlgorithms/src/SaveIsawQvector.cpp
index 1535e1a53dc..eea9d5a7e2d 100644
--- a/Framework/MDAlgorithms/src/SaveIsawQvector.cpp
+++ b/Framework/MDAlgorithms/src/SaveIsawQvector.cpp
@@ -66,7 +66,7 @@ void SaveIsawQvector::init() {
"An input EventWorkspace with units along X-axis and defined "
"instrument with defined sample");
declareProperty(
- new FileProperty("Filename", "", FileProperty::OptionalSave, {".bin"}),
+ new FileProperty("Filename", "", FileProperty::OptionalSave, {".bin"}),
"Optional path to an hkl file to save. Vectors returned if no file "
"requested.");
declareProperty("RightHanded", true, "Save the Q-vector as k_f - k_i");
diff --git a/Framework/MDAlgorithms/src/SaveMD.cpp b/Framework/MDAlgorithms/src/SaveMD.cpp
index 9b011f00040..bd5e60bef7f 100644
--- a/Framework/MDAlgorithms/src/SaveMD.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -54,7 +54,7 @@ void SaveMD::init() {
"An input MDEventWorkspace or MDHistoWorkspace.");
declareProperty(
- new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
+ new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
"The name of the Nexus file to write, as a full or relative path.\n"
"Optional if UpdateFileBackEnd is checked.");
// Filename is NOT used if UpdateFileBackEnd
diff --git a/Framework/MDAlgorithms/src/SaveMD2.cpp b/Framework/MDAlgorithms/src/SaveMD2.cpp
index dca81ab0fbe..3cf980d9286 100644
--- a/Framework/MDAlgorithms/src/SaveMD2.cpp
+++ b/Framework/MDAlgorithms/src/SaveMD2.cpp
@@ -55,7 +55,7 @@ void SaveMD2::init() {
"An input MDEventWorkspace or MDHistoWorkspace.");
declareProperty(
- new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
+ new FileProperty("Filename", "", FileProperty::OptionalSave, {".nxs"}),
"The name of the Nexus file to write, as a full or relative path.\n"
"Optional if UpdateFileBackEnd is checked.");
// Filename is NOT used if UpdateFileBackEnd
diff --git a/Framework/MDAlgorithms/src/SaveZODS.cpp b/Framework/MDAlgorithms/src/SaveZODS.cpp
index 8ee077f7614..27741dad717 100644
--- a/Framework/MDAlgorithms/src/SaveZODS.cpp
+++ b/Framework/MDAlgorithms/src/SaveZODS.cpp
@@ -49,7 +49,7 @@ void SaveZODS::init() {
"An input MDHistoWorkspace in HKL space.");
declareProperty(
- new FileProperty("Filename", "", FileProperty::Save, {".h5"}),
+ new FileProperty("Filename", "", FileProperty::Save, {".h5"}),
"The name of the HDF5 file to write, as a full or relative path.");
}
diff --git a/Framework/MDAlgorithms/src/SliceMD.cpp b/Framework/MDAlgorithms/src/SliceMD.cpp
index 93d6fab5b04..de1249cd284 100644
--- a/Framework/MDAlgorithms/src/SliceMD.cpp
+++ b/Framework/MDAlgorithms/src/SliceMD.cpp
@@ -49,7 +49,8 @@ void SliceMD::init() {
"Name of the output MDEventWorkspace.");
declareProperty(
- new FileProperty("OutputFilename", "", FileProperty::OptionalSave, {".nxs"}),
+ new FileProperty("OutputFilename", "", FileProperty::OptionalSave,
+ {".nxs"}),
"Optional: Specify a NeXus file to write if you want the output "
"workspace to be file-backed.");
diff --git a/Framework/SINQ/src/LoadFlexiNexus.cpp b/Framework/SINQ/src/LoadFlexiNexus.cpp
index 127093ba27d..8ee09c83098 100644
--- a/Framework/SINQ/src/LoadFlexiNexus.cpp
+++ b/Framework/SINQ/src/LoadFlexiNexus.cpp
@@ -24,9 +24,11 @@ using namespace ::NeXus;
void LoadFlexiNexus::init() {
- declareProperty(new FileProperty("Filename", "", FileProperty::Load, {".hdf", ".h5", ""}),
- "A NeXus file");
- declareProperty(new FileProperty("Dictionary", "", FileProperty::Load, {".txt", ".dic", ""}),
+ declareProperty(
+ new FileProperty("Filename", "", FileProperty::Load, {".hdf", ".h5", ""}),
+ "A NeXus file");
+ declareProperty(new FileProperty("Dictionary", "", FileProperty::Load,
+ {".txt", ".dic", ""}),
"A Dictionary for controlling NeXus loading");
declareProperty(new WorkspaceProperty<Workspace>("OutputWorkspace", "",
Direction::Output));
diff --git a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
index 0e98ca3e633..e2063635a64 100644
--- a/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+++ b/Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
@@ -72,7 +72,8 @@ void AlignAndFocusPowder::init() {
// "The name of the workspace containing the filtered low resolution TOF
// data.");
declareProperty(
- new FileProperty("CalFileName", "", FileProperty::OptionalLoad, {".h5", ".hd5", ".hdf", ".cal"}),
+ new FileProperty("CalFileName", "", FileProperty::OptionalLoad,
+ {".h5", ".hd5", ".hdf", ".cal"}),
"The name of the CalFile with offset, masking, and grouping data");
declareProperty(
new WorkspaceProperty<GroupingWorkspace>(
diff --git a/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp b/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
index 6a435f46fe5..f7dfea80775 100644
--- a/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSBeamFinder.cpp
@@ -25,9 +25,9 @@ using namespace Geometry;
using namespace DataObjects;
void SANSBeamFinder::init() {
- declareProperty(
- new API::FileProperty("Filename", "", API::FileProperty::Load, {"_event.nxs", ".xml"}),
- "Data filed used to find beam center");
+ declareProperty(new API::FileProperty("Filename", "", API::FileProperty::Load,
+ {"_event.nxs", ".xml"}),
+ "Data filed used to find beam center");
declareProperty("BeamCenterX", EMPTY_DBL(),
"Beam position in X pixel coordinates");
diff --git a/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
index 2c1c73cd5ce..522618d464f 100644
--- a/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
@@ -33,15 +33,15 @@ using namespace DataObjects;
void SANSSensitivityCorrection::init() {
declareProperty(new WorkspaceProperty<>(
"InputWorkspace", "", Direction::Input, PropertyMode::Optional));
- declareProperty(
- new API::FileProperty("Filename", "", API::FileProperty::Load, {"_event.nxs", ".xml"}),
- "Flood field or sensitivity file.");
+ declareProperty(new API::FileProperty("Filename", "", API::FileProperty::Load,
+ {"_event.nxs", ".xml"}),
+ "Flood field or sensitivity file.");
declareProperty("UseSampleDC", true, "If true, the dark current subtracted "
"from the sample data will also be "
"subtracted from the flood field.");
declareProperty(new API::FileProperty("DarkCurrentFile", "",
API::FileProperty::OptionalLoad,
- {"_event.nxs", ".xml"}),
+ {"_event.nxs", ".xml"}),
"The name of the input file to load as dark current.");
auto positiveDouble = boost::make_shared<BoundedValidator<double>>();
--
GitLab