Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
5c7ca6b4
Commit
5c7ca6b4
authored
7 years ago
by
Samuel Jackson
Browse files
Options
Downloads
Patches
Plain Diff
Refs #20409 Change property name.
parent
6ef5badc
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Crystal/src/FindSXPeaks.cpp
+16
-17
16 additions, 17 deletions
Framework/Crystal/src/FindSXPeaks.cpp
with
16 additions
and
17 deletions
Framework/Crystal/src/FindSXPeaks.cpp
+
16
−
17
View file @
5c7ca6b4
...
@@ -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
(
"X
Unit
Resolution"
,
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
(
"X
Unit
Resolution"
,
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
(
"X
Unit
Resolution"
,
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
(
"X
Unit
Resolution"
);
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"
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment