Skip to content

Commit

Permalink
Fix compilation issue arising from merge.
Browse files Browse the repository at this point in the history
Refs #11056
  • Loading branch information
martyngigg committed Mar 4, 2016
1 parent 5b5e2bb commit e45bebc
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions Framework/MDAlgorithms/src/LoadSQW2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,21 @@ int LoadSQW2::confidence(Kernel::FileDescriptor &descriptor) const {
/// Initialize the algorithm's properties.
void LoadSQW2::init() {
using namespace API;
using Kernel::make_unique;
using Kernel::PropertyWithValue;
using Kernel::StringListValidator;
typedef std::initializer_list<std::string> StringInitializerList;

// Inputs
declareProperty(
new FileProperty("Filename", "", FileProperty::Load, {".sqw"}),
"File of type SQW format");
declareProperty(new PropertyWithValue<bool>("MetadataOnly", false),
// std::vector<std::string> exts = {".sqw"};
declareProperty(make_unique<FileProperty>("Filename", "", FileProperty::Load,
StringInitializerList({".sqw"})),
"File of type SQW format");
declareProperty(make_unique<PropertyWithValue<bool>>("MetadataOnly", false),
"Load Metadata without events.");
declareProperty(new API::FileProperty("OutputFilename", "",
FileProperty::OptionalSave, {".nxs"}),
declareProperty(make_unique<FileProperty>("OutputFilename", "",
FileProperty::OptionalSave,
StringInitializerList({".nxs"})),
"If specified, the output workspace will be a file-backed "
"MDEventWorkspace");
std::vector<std::string> allowed = {"Q_sample", "HKL"};
Expand All @@ -130,7 +134,7 @@ void LoadSQW2::init() {
"The required frame for the output workspace");

// Outputs
declareProperty(new WorkspaceProperty<IMDEventWorkspace>(
declareProperty(make_unique<WorkspaceProperty<IMDEventWorkspace>>(
"OutputWorkspace", "", Kernel::Direction::Output),
"Output IMDEventWorkspace reflecting SQW data");
}
Expand Down

0 comments on commit e45bebc

Please sign in to comment.