Skip to content

Commit

Permalink
Suppress false errors on IDR
Browse files Browse the repository at this point in the history
Refs #11681
  • Loading branch information
DanNixon committed May 5, 2015
1 parent 1e2de6d commit fa50ab9
Showing 1 changed file with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ Mantid::API::MatrixWorkspace_sptr IndirectDataReduction::loadInstrumentIfNotExis
std::string parameterFilename = idfDirectory + instrumentName + "_Definition.xml";
IAlgorithm_sptr loadAlg = AlgorithmManager::Instance().create("LoadEmptyInstrument");
loadAlg->setChild(true);
loadAlg->setLogging(false);
loadAlg->initialize();
loadAlg->setProperty("Filename", parameterFilename);
loadAlg->setProperty("OutputWorkspace", "__IDR_Inst");
Expand All @@ -219,6 +220,7 @@ Mantid::API::MatrixWorkspace_sptr IndirectDataReduction::loadInstrumentIfNotExis
std::string ipfFilename = idfDirectory + instrumentName + "_" + analyser + "_" + reflection + "_Parameters.xml";
IAlgorithm_sptr loadParamAlg = AlgorithmManager::Instance().create("LoadParameterFile");
loadParamAlg->setChild(true);
loadParamAlg->setLogging(false);
loadParamAlg->initialize();
loadParamAlg->setProperty("Filename", ipfFilename);
loadParamAlg->setProperty("Workspace", instWorkspace);
Expand All @@ -229,8 +231,10 @@ Mantid::API::MatrixWorkspace_sptr IndirectDataReduction::loadInstrumentIfNotExis
}
catch(std::exception &ex)
{
g_log.error() << "Failed to load instrument with error: "
<< ex.what() << std::endl;
g_log.warning() << "Failed to load instrument with error: "
<< ex.what()
<< ". The current facility may not be fully supported."
<< std::endl;
return MatrixWorkspace_sptr();
}
}
Expand Down Expand Up @@ -346,7 +350,7 @@ void IndirectDataReduction::instrumentLoadingDone(bool error)
{
if(error)
{
g_log.error("Instument loading failed! This instrument (or analyser/reflection configuration) may not be supported by the interface.");
g_log.warning("Instument loading failed! This instrument (or analyser/reflection configuration) may not be supported by the interface.");
return;
}
}
Expand Down

0 comments on commit fa50ab9

Please sign in to comment.