From 4a0ce07eebef9ce64553eb5f13b2c2d2cd67d33e Mon Sep 17 00:00:00 2001
From: Karl Palmen <karl.palmen@stfc.ac.uk>
Date: Fri, 21 Sep 2012 15:00:10 +0100
Subject: [PATCH] Enable some subalgorithms to report progress re #4463
This has improved progress reporting, but there is still work to do, particularly modifying the progress range of LoadRaw3, so that it starts where the instrument loading has finished rather than 0%.
Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
---
Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp | 7 +++++++
.../DataHandling/src/UpdateInstrumentFromFile.cpp | 2 +-
.../Geometry/src/Instrument/InstrumentDefinitionParser.cpp | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
index 07a5ed4cdd2..b07545d3d2c 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRawHelper.cpp
@@ -538,6 +538,10 @@ namespace Mantid
if (i != std::string::npos) instrumentID.erase(i);
IAlgorithm_sptr loadInst= createSubAlgorithm("LoadInstrument");
+ // Enable progress reporting by sub-algorithm -
+ loadInst->addObserver(m_progressObserver);
+ setChildStartProgress(0.0);
+ setChildEndProgress(0.25);
// Now execute the sub-algorithm. Catch and log any error, but don't stop.
bool executionSuccessful(true);
try
@@ -577,6 +581,9 @@ namespace Mantid
IAlgorithm_sptr updateInst = createSubAlgorithm("UpdateInstrumentFromFile");
updateInst->setProperty<MatrixWorkspace_sptr>("Workspace", localWorkspace);
updateInst->setPropertyValue("Filename", fileName);
+ updateInst->addObserver(m_progressObserver); // Enable progress reporting bu subalgorithm
+ setChildStartProgress(0.25);
+ setChildEndProgress(0.50);
if(value == "datafile-ignore-phi" )
{
updateInst->setProperty("IgnorePhi", true);
diff --git a/Code/Mantid/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp b/Code/Mantid/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
index 8e14626b2c4..63359838a05 100644
--- a/Code/Mantid/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
@@ -225,7 +225,7 @@ namespace Mantid
catch (Kernel::Exception::NotFoundError&)
{
}
- progress(static_cast<double>(i)/numDetector);
+ progress(static_cast<double>(i)/numDetector,"Updating Detector Positions from File");
}
}
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
index a382069666e..adea341f2d6 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
@@ -280,7 +280,7 @@ namespace Geometry
if (prog) prog->resetNumSteps(pNL_comp_length, 0.0, 1.0);
for (unsigned long i = 0; i < pNL_comp_length; i++)
{
- if(prog) prog->report();
+ if(prog) prog->report("Loading instrument Definition");
// we are only interest in the top level component elements hence
// the reason for the if statement below
--
GitLab