Skip to content
Snippets Groups Projects
Commit 5c7ca6b4 authored by Samuel Jackson's avatar Samuel Jackson
Browse files

Refs #20409 Change property name.

parent 6ef5badc
No related merge requests found
...@@ -128,26 +128,25 @@ void FindSXPeaks::init() { ...@@ -128,26 +128,25 @@ void FindSXPeaks::init() {
// Declare // Declare
std::vector<std::string> resolutionStrategy = { std::vector<std::string> resolutionStrategy = {
relativeResolutionStrategy, absoluteResolutionPeaksStrategy}; relativeResolutionStrategy, absoluteResolutionPeaksStrategy};
declareProperty( declareProperty("ResolutionStrategy", relativeResolutionStrategy,
"ResolutionStrategy", relativeResolutionStrategy, boost::make_shared<StringListValidator>(resolutionStrategy),
boost::make_shared<StringListValidator>(resolutionStrategy), "Different options for the resolution."
"Different options for the resolution." "1. RelativeResolution: This defines a relative tolerance "
"1. RelativeResolution: This defines a relative tolerance " "needed to avoid peak duplication in number of pixels. "
"needed to avoid peak duplication in number of pixels. " "This selection will enable the Resolution property and "
"This selection will enable the Resolution property and " "disable the XResolution, PhiResolution, ThetaResolution.\n"
"disable the XUnitResolution, PhiResolution, ThetaResolution.\n" "1. AbsoluteResolution: This defines an absolute tolerance "
"1. AbsoluteResolution: This defines an absolute tolerance " "needed to avoid peak duplication in number of pixels. "
"needed to avoid peak duplication in number of pixels. " "This selection will disable the Resolution property and "
"This selection will disable the Resolution property and " "enable the XResolution, PhiResolution, "
"enable the XUnitResolution, PhiResolution, " "ThetaResolution.\n");
"ThetaResolution.\n");
declareProperty( declareProperty(
"Resolution", 0.01, mustBePositiveDouble, "Resolution", 0.01, mustBePositiveDouble,
"Tolerance needed to avoid peak duplication in number of pixels"); "Tolerance needed to avoid peak duplication in number of pixels");
declareProperty( declareProperty(
"XUnitResolution", 5000., mustBePositiveDouble, "XResolution", 5000., mustBePositiveDouble,
"Absolute tolerance in time-of-flight or d-spacing needed to avoid peak " "Absolute tolerance in time-of-flight or d-spacing needed to avoid peak "
"duplication in number of pixels. The values are specified " "duplication in number of pixels. The values are specified "
"in microseconds."); "in microseconds.");
...@@ -170,7 +169,7 @@ void FindSXPeaks::init() { ...@@ -170,7 +169,7 @@ void FindSXPeaks::init() {
Mantid::Kernel::ePropertyCriterion::IS_EQUAL_TO, Mantid::Kernel::ePropertyCriterion::IS_EQUAL_TO,
relativeResolutionStrategy)); relativeResolutionStrategy));
setPropertySettings("XUnitResolution", setPropertySettings("XResolution",
make_unique<EnabledWhenProperty>( make_unique<EnabledWhenProperty>(
"ResolutionStrategy", "ResolutionStrategy",
Mantid::Kernel::ePropertyCriterion::IS_EQUAL_TO, Mantid::Kernel::ePropertyCriterion::IS_EQUAL_TO,
...@@ -197,7 +196,7 @@ void FindSXPeaks::init() { ...@@ -197,7 +196,7 @@ void FindSXPeaks::init() {
const std::string resolutionGroup = "Resolution Settings"; const std::string resolutionGroup = "Resolution Settings";
setPropertyGroup("ResolutionStrategy", resolutionGroup); setPropertyGroup("ResolutionStrategy", resolutionGroup);
setPropertyGroup("Resolution", resolutionGroup); setPropertyGroup("Resolution", resolutionGroup);
setPropertyGroup("XUnitResolution", resolutionGroup); setPropertyGroup("XResolution", resolutionGroup);
setPropertyGroup("PhiResolution", resolutionGroup); setPropertyGroup("PhiResolution", resolutionGroup);
setPropertyGroup("TwoThetaResolution", resolutionGroup); setPropertyGroup("TwoThetaResolution", resolutionGroup);
...@@ -411,7 +410,7 @@ FindSXPeaks::getCompareStrategy() const { ...@@ -411,7 +410,7 @@ FindSXPeaks::getCompareStrategy() const {
return Mantid::Kernel::make_unique< return Mantid::Kernel::make_unique<
FindSXPeaksHelper::RelativeCompareStrategy>(resolution); FindSXPeaksHelper::RelativeCompareStrategy>(resolution);
} else { } else {
double xUnitResolution = getProperty("XUnitResolution"); double xUnitResolution = getProperty("XResolution");
double phiResolution = getProperty("PhiResolution"); double phiResolution = getProperty("PhiResolution");
double twoThetaResolution = getProperty("TwoThetaResolution"); double twoThetaResolution = getProperty("TwoThetaResolution");
const auto tofUnits = getWorkspaceXAxisUnit(getProperty("InputWorkspace")); const auto tofUnits = getWorkspaceXAxisUnit(getProperty("InputWorkspace"));
......
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