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
a6b73328
Commit
a6b73328
authored
7 years ago
by
Gemma Guest
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Re #18829 Make CalculateResolution errors non-fatal"
This reverts commit
188007ef
.
parent
69ce5eeb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
+5
-11
5 additions, 11 deletions
Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
with
5 additions
and
11 deletions
Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
+
5
−
11
View file @
a6b73328
...
...
@@ -206,8 +206,7 @@ void ReflectometryReductionOneAuto2::init() {
// Output workspace in Q
declareProperty
(
make_unique
<
WorkspaceProperty
<
MatrixWorkspace
>>
(
"OutputWorkspaceBinned"
,
""
,
Direction
::
Output
,
PropertyMode
::
Optional
),
"OutputWorkspaceBinned"
,
""
,
Direction
::
Output
),
"Output workspace in Q (rebinned workspace)"
);
// Output workspace in Q (unbinned)
...
...
@@ -276,17 +275,12 @@ void ReflectometryReductionOneAuto2::exec() {
MatrixWorkspace_sptr
IvsLam
=
alg
->
getProperty
(
"OutputWorkspaceWavelength"
);
MatrixWorkspace_sptr
IvsQ
=
alg
->
getProperty
(
"OutputWorkspace"
);
std
::
vector
<
double
>
params
;
MatrixWorkspace_sptr
IvsQB
=
rebinAndScale
(
IvsQ
,
theta
,
params
);
setProperty
(
"OutputWorkspaceWavelength"
,
IvsLam
);
setProperty
(
"OutputWorkspace"
,
IvsQ
);
std
::
vector
<
double
>
params
;
try
{
MatrixWorkspace_sptr
IvsQB
=
rebinAndScale
(
IvsQ
,
theta
,
params
);
setProperty
(
"OutputWorkspaceBinned"
,
IvsQB
);
}
catch
(
std
::
exception
&
ex
)
{
g_log
.
error
()
<<
"Failed to rebin and scale result: "
<<
ex
.
what
()
<<
". OutputWorkspaceBinned will not be set."
;
}
setProperty
(
"OutputWorkspaceBinned"
,
IvsQB
);
// Set other properties so they can be updated in the Reflectometry interface
setProperty
(
"ThetaIn"
,
theta
);
...
...
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