Skip to content
Snippets Groups Projects
Commit a6b73328 authored by Gemma Guest's avatar Gemma Guest
Browse files

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
......@@ -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);
......
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