diff --git a/Code/Mantid/Framework/Algorithms/src/ApplyTransmissionCorrection.cpp b/Code/Mantid/Framework/Algorithms/src/ApplyTransmissionCorrection.cpp index 66838ee5b63d033cb3939bef3fc2875f72bccee9..a9f3a695c231ed265b36165614a9552df0c75b78 100644 --- a/Code/Mantid/Framework/Algorithms/src/ApplyTransmissionCorrection.cpp +++ b/Code/Mantid/Framework/Algorithms/src/ApplyTransmissionCorrection.cpp @@ -120,7 +120,7 @@ void ApplyTransmissionCorrection::exec() EOut[j] = sqrt( d1*d1 + d2*d2 ); YOut[j] = YIn[j]/t_term; } - progress.report(); + progress.report("Applying Transmission Correction"); } } diff --git a/Code/Mantid/Framework/Algorithms/src/CalculateEfficiency.cpp b/Code/Mantid/Framework/Algorithms/src/CalculateEfficiency.cpp index 28c9f3b90809808f9c8d07d8cb32c2af219e08a4..7759423c15563e7039410a1346456f506fc64594 100644 --- a/Code/Mantid/Framework/Algorithms/src/CalculateEfficiency.cpp +++ b/Code/Mantid/Framework/Algorithms/src/CalculateEfficiency.cpp @@ -64,7 +64,7 @@ void CalculateEfficiency::exec() // Now create the output workspace MatrixWorkspace_sptr outputWS = getProperty("OutputWorkspace"); - Progress progress(this,0.0,1.0,5); + Progress progress(this,0.0,1.0,4); // Sum up all the wavelength bins IAlgorithm_sptr childAlg = createSubAlgorithm("Integration"); @@ -80,7 +80,7 @@ void CalculateEfficiency::exec() } setProperty("OutputWorkspace",outputWS); - progress.report(); + progress.report("Detector Efficiency"); double sum = 0.0; double err = 0.0; @@ -90,7 +90,7 @@ void CalculateEfficiency::exec() // Skip monitors and masked detectors sumUnmaskedDetectors(rebinnedWS, sum, err, npixels); - progress.report(); + progress.report("Detector Efficiency"); // Normalize each detector pixel by the sum we just found to get the // relative efficiency. If the minimum and maximum efficiencies are @@ -101,7 +101,7 @@ void CalculateEfficiency::exec() // the newly masked detectors. normalizeDetectors(rebinnedWS, outputWS, sum, err, npixels, min_eff, max_eff); - progress.report(); + progress.report("Detector Efficiency"); if ( !isEmpty(min_eff) || !isEmpty(max_eff) ) { @@ -109,7 +109,7 @@ void CalculateEfficiency::exec() // the acceptable efficiency range. sumUnmaskedDetectors(rebinnedWS, sum, err, npixels); - progress.report(); + progress.report("Detector Efficiency"); // Now that we have a normalization factor that excludes bad pixels, // recompute the relative efficiency. diff --git a/Code/Mantid/Framework/Algorithms/src/CalculateTransmissionBeamSpreader.cpp b/Code/Mantid/Framework/Algorithms/src/CalculateTransmissionBeamSpreader.cpp index cd08d976b2d199f0c02d0e771c2c0910d0b823db..5f561696b16b4ae457548c511784a64b8163d364 100644 --- a/Code/Mantid/Framework/Algorithms/src/CalculateTransmissionBeamSpreader.cpp +++ b/Code/Mantid/Framework/Algorithms/src/CalculateTransmissionBeamSpreader.cpp @@ -195,7 +195,7 @@ void CalculateTransmissionBeamSpreader::exec() { E[i] = std::abs(E[i]/Y[i]); Y[i] = std::log10(Y[i]); - progress.report(); + progress.report("Calculate Transmission"); } // Now fit this to a straight line diff --git a/Code/Mantid/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp b/Code/Mantid/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp index 359d51e66674edb6e9a4554b9c8d38a718b08895..21026886df16f8fc112bcc2619bc7566eecb26d1 100644 --- a/Code/Mantid/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp +++ b/Code/Mantid/Framework/Algorithms/src/FindCenterOfMassPosition2.cpp @@ -210,7 +210,7 @@ void FindCenterOfMassPosition2::exec() distance_check = distance; first_run = false; - progress.report(); + progress.report("Find Beam Center"); } std::string output = getProperty("Output"); diff --git a/Code/Mantid/Framework/Algorithms/src/SANSDirectBeamScaling.cpp b/Code/Mantid/Framework/Algorithms/src/SANSDirectBeamScaling.cpp index c2c7570bf9b40d9dd66ebe62c4d68b39caba4cf1..fe346742a90a4f8b67f65a6d2695f14a89de3776 100644 --- a/Code/Mantid/Framework/Algorithms/src/SANSDirectBeamScaling.cpp +++ b/Code/Mantid/Framework/Algorithms/src/SANSDirectBeamScaling.cpp @@ -134,7 +134,7 @@ void SANSDirectBeamScaling::exec() nPixels += 1; sdd += pixelDistance; } - progress.report("Summing beam counts"); + progress.report("Absolute Scaling"); } // Get the average SDD for the counted pixels, and transform to mm. sdd = sdd/nPixels*1000.0; diff --git a/Code/Mantid/Framework/Algorithms/src/SANSSolidAngleCorrection.cpp b/Code/Mantid/Framework/Algorithms/src/SANSSolidAngleCorrection.cpp index e3790d0440d7baf82b6351b3338780650bbb2aa5..ee89716a238764032557d575bb35c9ea6f603d1f 100644 --- a/Code/Mantid/Framework/Algorithms/src/SANSSolidAngleCorrection.cpp +++ b/Code/Mantid/Framework/Algorithms/src/SANSSolidAngleCorrection.cpp @@ -91,7 +91,7 @@ void SANSSolidAngleCorrection::exec() YOut[j] = YIn[j]*corr; EOut[j] = fabs(EIn[j]*corr); } - progress.report(); + progress.report("Solid Angle Correction"); } } diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNeXus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNeXus.cpp index 87cb405cf3828306b5618ab031233b23bf2a6080..b72c5417dcb6af6c32430cb233c3b57ad3946a9c 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadEventPreNeXus.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadEventPreNeXus.cpp @@ -455,7 +455,7 @@ void LoadEventPreNeXus::procEvents(DataObjects::EventWorkspace_sptr & workspace) procEventsLinear(workspace, event_buffer, current_event_buffer_size, fileOffset); //Report progress - prog.report(); + prog.report("Load Event PreNeXus"); } //Clean up the buffers