Skip to content
Snippets Groups Projects
Commit 4f72c164 authored by Lynch, Vickie's avatar Lynch, Vickie
Browse files

Refs #21371 clang-format

parent 17122118
No related merge requests found
......@@ -26,11 +26,11 @@ const std::string FindUBUsingFFT::category() const {
/** Initialize the algorithm's properties.
*/
void FindUBUsingFFT::init() {
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
"PeaksWorkspace", "", Direction::InOut),
"Input Peaks Workspace");
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
mustBePositive->setLower(0.0);
// use negative values, force user to input all parameters
......
......@@ -19,10 +19,10 @@ using namespace Mantid::Geometry;
/** Initialize the algorithm's properties.
*/
void FindUBUsingIndexedPeaks::init() {
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
"PeaksWorkspace", "", Direction::InOut),
"Input Peaks Workspace");
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
mustBePositive->setLower(0.0);
this->declareProperty("Tolerance", 0.1, mustBePositive,
"Indexing Tolerance (0.1)");
......
......@@ -18,17 +18,17 @@ using namespace Mantid::Geometry;
/** Initialize the algorithm's properties.
*/
void FindUBUsingLatticeParameters::init() {
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
"PeaksWorkspace", "", Direction::InOut),
"Input Peaks Workspace");
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
mustBePositive->setLower(0.0);
auto moreThan2Int = boost::make_shared<BoundedValidator<int> >();
auto moreThan2Int = boost::make_shared<BoundedValidator<int>>();
moreThan2Int->setLower(2);
auto reasonable_angle = boost::make_shared<BoundedValidator<double> >();
auto reasonable_angle = boost::make_shared<BoundedValidator<double>>();
reasonable_angle->setLower(5.0);
reasonable_angle->setUpper(175.0);
......
......@@ -35,32 +35,32 @@ const std::string FindUBUsingMinMaxD::category() const {
/** Initialize the algorithm's properties.
*/
void FindUBUsingMinMaxD::init() {
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
"PeaksWorkspace", "", Direction::InOut),
"Input Peaks Workspace");
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
mustBePositive->setLower(0.0);
auto atLeast3Int = boost::make_shared<BoundedValidator<int> >();
auto atLeast3Int = boost::make_shared<BoundedValidator<int>>();
atLeast3Int->setLower(3);
// use negative values, force user to input all parameters
this->declareProperty(make_unique<PropertyWithValue<double> >(
this->declareProperty(make_unique<PropertyWithValue<double>>(
"MinD", -1.0, mustBePositive, Direction::Input),
"Lower Bound on Lattice Parameters a, b, c");
this->declareProperty(make_unique<PropertyWithValue<double> >(
this->declareProperty(make_unique<PropertyWithValue<double>>(
"MaxD", -1.0, mustBePositive, Direction::Input),
"Upper Bound on Lattice Parameters a, b, c");
this->declareProperty(make_unique<PropertyWithValue<int> >(
this->declareProperty(make_unique<PropertyWithValue<int>>(
"NumInitial", 20, atLeast3Int, Direction::Input),
"Number of Peaks to Use on First Pass(20)");
this->declareProperty(
make_unique<PropertyWithValue<double> >("Tolerance", 0.15, mustBePositive,
Direction::Input),
make_unique<PropertyWithValue<double>>("Tolerance", 0.15, mustBePositive,
Direction::Input),
"Indexing Tolerance (0.15)");
}
......
......@@ -18,23 +18,23 @@ using namespace Mantid::Geometry;
/** Initialize the algorithm's properties.
*/
void IndexPeaks::init() {
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace> >(
this->declareProperty(make_unique<WorkspaceProperty<PeaksWorkspace>>(
"PeaksWorkspace", "", Direction::InOut),
"Input Peaks Workspace");
auto mustBePositive = boost::make_shared<BoundedValidator<double> >();
auto mustBePositive = boost::make_shared<BoundedValidator<double>>();
mustBePositive->setLower(0.0);
this->declareProperty(
make_unique<PropertyWithValue<double> >("Tolerance", 0.15, mustBePositive,
Direction::Input),
make_unique<PropertyWithValue<double>>("Tolerance", 0.15, mustBePositive,
Direction::Input),
"Indexing Tolerance (0.15)");
this->declareProperty(
make_unique<PropertyWithValue<int> >("NumIndexed", 0, Direction::Output),
make_unique<PropertyWithValue<int>>("NumIndexed", 0, Direction::Output),
"Gets set with the number of indexed peaks.");
this->declareProperty(make_unique<PropertyWithValue<double> >(
this->declareProperty(make_unique<PropertyWithValue<double>>(
"AverageError", 0.0, Direction::Output),
"Gets set with the average HKL indexing error.");
......@@ -140,9 +140,8 @@ void IndexPeaks::exec() {
{ // which is usually sufficient
try {
IndexingUtils::Optimize_UB(tempUB, miller_indices, q_vectors);
}
catch (...) // If there is any problem, such as too few
{ // independent peaks, just use the original UB
} catch (...) // If there is any problem, such as too few
{ // independent peaks, just use the original UB
tempUB = UB;
done = true;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment