Skip to content
Snippets Groups Projects
Commit 82634855 authored by Pete Peterson's avatar Pete Peterson Committed by GitHub
Browse files

Merge pull request #19250 from mantidproject/19245_Error_processing_with_IPython_notebook

ISIS Reflectometry GUI: Fixed bug where unexpected error was thrown when processing with output notebook option
parents 819fad7f a86dfa50
No related branches found
No related tags found
No related merge requests found
......@@ -463,7 +463,9 @@ boost::tuple<std::string, std::string> reduceRowString(
const DataProcessorPreprocessingAlgorithm preprocessor =
preprocessMap.at(colName);
// The pre-processing options
const std::string options = preprocessingOptionsMap.at(colName);
const std::string options = preprocessingOptionsMap.count(colName) > 0
? preprocessingOptionsMap.at(colName)
: "";
// Python code ran to load and pre-process runs
const boost::tuple<std::string, std::string> load_ws_string =
loadWorkspaceString(runStr, instrument, preprocessor, options);
......
......@@ -629,11 +629,12 @@ GenericDataProcessorPresenter::reduceRow(const std::vector<std::string> &data) {
restrictedProps.insert(prop);
}
auto preprocessor = m_preprocessMap[columnName];
auto preprocessor = m_preprocessMap.at(columnName);
// Global pre-processing options for this algorithm as a string
const std::string options = globalOptions[columnName];
const std::string options = globalOptions.count(columnName) > 0
? globalOptions.at(columnName)
: "";
auto optionsMap = parseKeyValueString(options);
auto runWS =
prepareRunWorkspace(preProcessValue, preprocessor, optionsMap);
......
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